diff options
author | cushon <cushon@google.com> | 2016-11-29 11:18:48 -0800 |
---|---|---|
committer | Liam Miller-Cushon <cushon@google.com> | 2016-11-30 15:55:10 -0800 |
commit | 4d8df55924dbbb3b931303fd95b73eaf6280b5f3 (patch) | |
tree | ceebc06418b40635c41f0917b5a8ce71719d1649 /java/com | |
parent | 9278ff215c8a8c45c054ca71599df4cdff738666 (diff) | |
download | turbine-4d8df55924dbbb3b931303fd95b73eaf6280b5f3.tar.gz |
Fix resolution order of type parameters and member types
MOE_MIGRATED_REVID=140502777
Diffstat (limited to 'java/com')
-rw-r--r-- | java/com/google/turbine/binder/TypeBinder.java | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |