Merge pull request jboss-javassist#267 from sam-ma/master

Fix jboss-javassist#265 javassist.CannotCompileException: [source error] the called …
foobarrer · Sep 1, 2019 · bad4a16 · bad4a16
2 parents cf1d22f + d6d6b2e
commit bad4a16
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 13 deletions.
diff --git a/src/main/javassist/compiler/MemberCodeGen.java b/src/main/javassist/compiler/MemberCodeGen.java
@@ -619,6 +619,18 @@ public void atMethodCallCore(CtClass targetClass, String mname,
                           aload0pos, found);
     }
 
+    private boolean isFromSameDeclaringClass(CtClass outer, CtClass inner) {
+        try {
+            while (outer != null) {
+                if (isEnclosing(outer, inner))
+                    return true;
+                outer = outer.getDeclaringClass();
+            }
+        }
+        catch (NotFoundException e) {}
+        return false;
+    }
+
     private void atMethodCallCore2(CtClass targetClass, String mname,
                                    boolean isStatic, boolean isSpecial,
                                    int aload0pos,
@@ -636,19 +648,8 @@ private void atMethodCallCore2(CtClass targetClass, String mname,
                 throw new CompileError("no such constructor: " + targetClass.getName());
 
             if (declClass != thisClass && AccessFlag.isPrivate(acc)) {
-                boolean isNested = false;
-                if (declClass.getClassFile().getMajorVersion() >= ClassFile.JAVA_11) {
-                    try {
-                        CtClass[] nestedClasses = declClass.getNestedClasses();
-                        for (int i = 0; i < nestedClasses.length; i++) {
-                            if (thisClass == nestedClasses[i]) {
-                                isNested = true;
-                                break;
-                            }
-                        }
-                    } catch (NotFoundException ignored) { }
-                }
-                if (!isNested) {
+                if (declClass.getClassFile().getMajorVersion() < ClassFile.JAVA_11
+                        || !isFromSameDeclaringClass(declClass, thisClass)) {
                     desc = getAccessibleConstructor(desc, declClass, minfo);
                     bytecode.addOpcode(Opcode.ACONST_NULL); // the last parameter
                 }

diff --git a/src/test/javassist/JvstTest5.java b/src/test/javassist/JvstTest5.java
@@ -490,6 +490,33 @@ public void edit(NewExpr e) throws CannotCompileException {
         }
     }
 
+    public void testNestPrivateConstructor2() throws Exception {
+        CtClass cc = sloader.get("test5.NestHost4$InnerClass1");
+        cc.instrument(new ExprEditor() {
+            public void edit(NewExpr e) throws CannotCompileException {
+                String code = "$_ = $proceed($$);";
+                e.replace(code);
+            }
+        });
+        cc.writeFile();
+
+        cc = sloader.get("test5.NestHost4$InnerClass1$InnerClass5");
+        cc.instrument(new ExprEditor() {
+            public void edit(NewExpr e) throws CannotCompileException {
+                String code = "$_ = $proceed($$);";
+                e.replace(code);
+            }
+        });
+        cc.writeFile();
+        try {
+            Class<?> nestHost4Class = cloader.loadClass("test5.NestHost4");
+            nestHost4Class.getDeclaredConstructor().newInstance();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            fail("it should be able to access the private constructor of the nest host");
+        }
+    }
+
     public void testSwitchCaseWithStringConstant2() throws Exception {
         CtClass cc = sloader.makeClass("test5.SwitchCase2");
         cc.addMethod(CtNewMethod.make(

diff --git a/src/test/test5/NestHost4.java b/src/test/test5/NestHost4.java
@@ -0,0 +1,26 @@
+package test5;
+
+public class NestHost4 {
+  public void test() {
+    new InnerClass1().new InnerClass5();
+  }
+
+  private class InnerClass1 {
+    private InnerClass1() {
+      new InnerClass2();
+    }
+
+    private class InnerClass5 {
+      private InnerClass5() {
+        new InnerClass2().new InnerClass3();
+      }
+    }
+  }
+
+  private class InnerClass2 {
+
+    private class InnerClass3 {
+
+    }
+  }
+}