Apply NETBEANS-906 patch

jeffreymorlan · Nov 19, 2018 · 2813168 · 2813168
1 parent 038e3ca
commit 2813168
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -2545,7 +2545,6 @@ public <T extends JCTree> T copy(T tree, JCTree p) {
  // prefix it to the constructor arguments
  // "encl" will be cleared in TransTypes
  if (tree.encl != null && !clazztype.tsym.isInterface()) {
- tree.args = tree.args.prepend(makeNullCheck(tree.encl));
  finalargtypes = argtypes.prepend(tree.encl.type);
  } else {
  finalargtypes = argtypes;

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java
@@ -1708,7 +1708,7 @@ public List<JCExpression> getTypeArguments() {
  public JCExpression getIdentifier() { return clazz; }
  @DefinedBy(Api.COMPILER_TREE)
  public List<JCExpression> getArguments() {
- return encl != null && def != null ? args.tail : args;
+ return args;
  }
  @DefinedBy(Api.COMPILER_TREE)
  public JCClassDecl getClassBody() { return def; }