aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/com/google/turbine/binder/CanonicalTypeBinder.java4
-rw-r--r--java/com/google/turbine/binder/TypeBinder.java16
2 files changed, 2 insertions, 18 deletions
diff --git a/java/com/google/turbine/binder/CanonicalTypeBinder.java b/java/com/google/turbine/binder/CanonicalTypeBinder.java
index 31dc444..cbfdf0f 100644
--- a/java/com/google/turbine/binder/CanonicalTypeBinder.java
+++ b/java/com/google/turbine/binder/CanonicalTypeBinder.java
@@ -41,11 +41,11 @@ public class CanonicalTypeBinder {
ClassSymbol sym, SourceTypeBoundClass base, Env<ClassSymbol, TypeBoundClass> env) {
ClassTy superClassType = null;
if (base.superClassType() != null) {
- superClassType = Canonicalize.canonicalizeClassTy(env, sym, base.superClassType());
+ superClassType = Canonicalize.canonicalizeClassTy(env, base.owner(), base.superClassType());
}
ImmutableList.Builder<ClassTy> interfaceTypes = ImmutableList.builder();
for (ClassTy i : base.interfaceTypes()) {
- interfaceTypes.add(Canonicalize.canonicalizeClassTy(env, sym, i));
+ interfaceTypes.add(Canonicalize.canonicalizeClassTy(env, base.owner(), i));
}
ImmutableMap<TyVarSymbol, TyVarInfo> typParamTypes =
typeParameters(env, sym, base.typeParameterTypes());
diff --git a/java/com/google/turbine/binder/TypeBinder.java b/java/com/google/turbine/binder/TypeBinder.java
index 8397325..071ab39 100644
--- a/java/com/google/turbine/binder/TypeBinder.java
+++ b/java/com/google/turbine/binder/TypeBinder.java
@@ -195,22 +195,6 @@ public class TypeBinder {
case INTERFACE:
if (base.decl().xtnds().isPresent()) {
superClassType = (Type.ClassTy) bindClassTy(bindingScope, base.decl().xtnds().get());
- // Members inherited from the superclass are visible to interface types.
- // (The same is not true for interface types declared before other interface
- // types, at least according to javac.)
- bindingScope =
- bindingScope.append(
- new Scope() {
- @Override
- public LookupResult lookup(LookupKey lookup) {
- ClassSymbol result =
- Resolve.resolve(env, owner, base.superclass(), lookup.first());
- if (result != null) {
- return new LookupResult(result, lookup);
- }
- return null;
- }
- });
} else {
superClassType = Type.ClassTy.OBJECT;
}