diff options
author | cushon <cushon@google.com> | 2016-10-05 17:05:23 -0700 |
---|---|---|
committer | Liam Miller-Cushon <cushon@google.com> | 2016-10-05 21:12:30 -0700 |
commit | 4c1981b86b09d9802ce3f773c059c529546048a5 (patch) | |
tree | 0cd55d103d47045c2932a25fc40723630c55bf35 /java/com/google/turbine/binder/TypeBinder.java | |
parent | 5a08d0b091f99653ff51f60b10392340f4718f6c (diff) | |
download | turbine-4c1981b86b09d9802ce3f773c059c529546048a5.tar.gz |
Type canonicalization
Canonicalize qualified type names so qualifiers are always the declaring
class of the qualified type. For example, given:
```
class A<T> { class Inner {} }
class B extends A<String> {}
```
The type name `B.Inner` must be canonicalized as `A<String>.Inner` in bytecode.
MOE_MIGRATED_REVID=135300804
Diffstat (limited to 'java/com/google/turbine/binder/TypeBinder.java')
-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 162c3f6..219bc1f 100644 --- a/java/com/google/turbine/binder/TypeBinder.java +++ b/java/com/google/turbine/binder/TypeBinder.java @@ -27,7 +27,7 @@ import com.google.turbine.binder.bound.SourceTypeBoundClass; import com.google.turbine.binder.bound.SourceTypeBoundClass.FieldInfo; import com.google.turbine.binder.bound.SourceTypeBoundClass.MethodInfo; import com.google.turbine.binder.bound.SourceTypeBoundClass.ParamInfo; -import com.google.turbine.binder.bound.SourceTypeBoundClass.TyVarInfo; +import com.google.turbine.binder.bound.TypeBoundClass.TyVarInfo; import com.google.turbine.binder.env.Env; import com.google.turbine.binder.lookup.CompoundScope; import com.google.turbine.binder.lookup.LookupKey; @@ -560,7 +560,7 @@ public class TypeBinder { } else if (t.upper().isPresent()) { return new Type.WildUpperBoundedTy(bindTy(env, scope, t.upper().get())); } else { - return new Type.WildTy(); + return Type.WILD_TY; } } } |