diff options
Diffstat (limited to 'src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java')
| -rw-r--r-- | src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java index 6357419c..c37841c8 100644 --- a/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java +++ b/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java @@ -643,15 +643,16 @@ public class DeferredAttr extends JCTree.Visitor { } JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree); mref2.expr = exprTree; - Pair<Symbol, ?> lookupRes = - rs.resolveMemberReference(tree, localEnv, mref2, exprTree.type, - tree.name, argtypes.toList(), null, true, rs.arityMethodCheck, inferenceContext); - switch (lookupRes.fst.kind) { + Symbol lookupSym = + rs.resolveMemberReferenceByArity(localEnv, mref2, exprTree.type, + tree.name, argtypes.toList(), inferenceContext); + switch (lookupSym.kind) { //note: as argtypes are erroneous types, type-errors must //have been caused by arity mismatch case Kinds.ABSENT_MTH: case Kinds.WRONG_MTH: case Kinds.WRONG_MTHS: + case Kinds.WRONG_STATICNESS: checkContext.report(tree, diags.fragment("incompatible.arg.types.in.mref")); } } @@ -1037,11 +1038,10 @@ public class DeferredAttr extends JCTree.Visitor { attr.memberReferenceQualifierResult(tree)); JCMemberReference mref2 = new TreeCopier<Void>(make).copy(tree); mref2.expr = exprTree; - Pair<Symbol, ReferenceLookupHelper> lookupRes = - rs.resolveMemberReference(tree, localEnv, mref2, exprTree.type, - tree.name, List.<Type>nil(), null, true, rs.nilMethodCheck, - infer.emptyContext); - Symbol res = tree.sym = lookupRes.fst; + Symbol res = + rs.getMemberReference(tree, localEnv, mref2, + exprTree.type, tree.name); + tree.sym = res; if (res.kind >= Kinds.ERRONEOUS || res.type.hasTag(FORALL) || (res.flags() & Flags.VARARGS) != 0 || |