From 4d8df55924dbbb3b931303fd95b73eaf6280b5f3 Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Tue, 29 Nov 2016 11:18:48 -0800
Subject: Fix resolution order of type parameters and member types

MOE_MIGRATED_REVID=140502777
---
 java/com/google/turbine/binder/TypeBinder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'java/com')

diff --git a/java/com/google/turbine/binder/TypeBinder.java b/java/com/google/turbine/binder/TypeBinder.java
index 071ab39..45d4abc 100644
--- a/java/com/google/turbine/binder/TypeBinder.java
+++ b/java/com/google/turbine/binder/TypeBinder.java
@@ -109,11 +109,11 @@ public class TypeBinder {
       ClassSymbol curr = sym;
       while (curr != null) {
         HeaderBoundClass info = env.get(curr);
-        Symbol result = info.typeParameters().get(lookup.first());
+        Symbol result = Resolve.resolve(env, sym, curr, lookup.first());
         if (result != null) {
           return new LookupResult(result, lookup);
         }
-        result = Resolve.resolve(env, sym, curr, lookup.first());
+        result = info.typeParameters().get(lookup.first());
         if (result != null) {
           return new LookupResult(result, lookup);
         }
-- 
cgit v1.2.3