langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java
equal
deleted
inserted
replaced
539 // Check that we do not introduce a name clash by erasing types. |
539 // Check that we do not introduce a name clash by erasing types. |
540 for (Symbol sym : tree.sym.owner.members().getSymbolsByName(tree.name)) { |
540 for (Symbol sym : tree.sym.owner.members().getSymbolsByName(tree.name)) { |
541 if (sym != tree.sym && |
541 if (sym != tree.sym && |
542 types.isSameType(erasure(sym.type), tree.type)) { |
542 types.isSameType(erasure(sym.type), tree.type)) { |
543 log.error(tree.pos(), |
543 log.error(tree.pos(), |
544 "name.clash.same.erasure", tree.sym, |
544 Errors.NameClashSameErasure(tree.sym, sym)); |
545 sym); |
|
546 return; |
545 return; |
547 } |
546 } |
548 } |
547 } |
549 } |
548 } |
550 |
549 |
681 if (tree.varargsElement != null) |
680 if (tree.varargsElement != null) |
682 tree.varargsElement = types.erasure(tree.varargsElement); |
681 tree.varargsElement = types.erasure(tree.varargsElement); |
683 else |
682 else |
684 if (tree.args.length() != argtypes.length()) { |
683 if (tree.args.length() != argtypes.length()) { |
685 log.error(tree.pos(), |
684 log.error(tree.pos(), |
686 "method.invoked.with.incorrect.number.arguments", |
685 Errors.MethodInvokedWithIncorrectNumberArguments(tree.args.length(), |
687 tree.args.length(), argtypes.length()); |
686 argtypes.length())); |
688 } |
687 } |
689 tree.args = translateArgs(tree.args, argtypes, tree.varargsElement); |
688 tree.args = translateArgs(tree.args, argtypes, tree.varargsElement); |
690 |
689 |
691 tree.type = types.erasure(tree.type); |
690 tree.type = types.erasure(tree.type); |
692 // Insert casts of method invocation results as needed. |
691 // Insert casts of method invocation results as needed. |