Use implementing class in static binding when resolving default methods

This commit is contained in:
Mumfrey committed 2015-11-24 14:06:32 +00:00
1 parent 519b9c6da1
commit 6fa0432fcc
2 files changed
+33 -3

No files matched your search

@@ -245,6 +245,10 @@ public class ClassInfo extends TreeInfo {
// Abstract because this has to be static in order to contain the enum
public abstract ClassInfo getOwner();
public ClassInfo getImplementor() {
return this.getOwner();
}
public int getAccess() {
return this.modifiers;
@@ -352,6 +356,31 @@ public class ClassInfo extends TreeInfo {
return super.equals(obj);
}
}
/**
* A method resolved in an interface <em>via</em> a class, return the member
* wrapped so that the implementing class can be retrieved.
*/
public class InterfaceMethod extends Method {
private final ClassInfo owner;
public InterfaceMethod(Member member) {
super(member);
this.owner = member.getOwner();
}
@Override
public ClassInfo getOwner() {
return this.owner;
}
@Override
public ClassInfo getImplementor() {
return ClassInfo.this;
}
}
/**
* A field
@@ -1177,6 +1206,7 @@ public class ClassInfo extends TreeInfo {
* @param type Type of member to search for (field or method)
* @return the discovered member or null if the member could not be resolved
*/
@SuppressWarnings("unchecked")
private <M extends Member> M findInHierarchy(String name, String desc, boolean includeThisClass, Traversal traversal, int flags, Type type) {
if (includeThisClass) {
M member = this.findMember(name, desc, flags, type);
@@ -1204,7 +1234,7 @@ public class ClassInfo extends TreeInfo {
}
}
if (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces()) {
if (type == Type.METHOD && (this.isInterface || MixinEnvironment.getCompatibilityLevel().resolveMethodsInInterfaces())) {
for (String implemented : this.interfaces) {
ClassInfo iface = ClassInfo.forName(implemented);
if (iface == null) {
@@ -1212,7 +1242,7 @@ public class ClassInfo extends TreeInfo {
}
M member = iface.findInHierarchy(name, desc, true, traversal.next(), flags & ~ClassInfo.INCLUDE_PRIVATE, type);
if (member != null) {
return member;
return this.isInterface ? member : (M)new InterfaceMethod(member);
}
}
}
@@ -498,7 +498,7 @@ public class MixinTargetContext implements IReferenceMapperContext {
throw new InvalidMixinException(this, "Invalid " + methodRef + " in " + this + " resolved " + superMethod.getOwner()
+ " but is mixin.");
}
methodRef.setOwner(superMethod.getOwner().getName());
methodRef.setOwner(superMethod.getImplementor().getName());
} else if (ClassInfo.forName(methodRef.getOwner()).isMixin()) {
throw new MixinTransformerError("Error resolving " + methodRef + " in " + this);
}