GROOVY-9524

groovy · Mar 18, 2021 · f803e4a · f803e4a
1 parent ae69b14
commit f803e4a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/...re.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java b/...re.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java
@@ -4917,6 +4917,32 @@ public void testCompileStatic9517() {
         runConformTest(sources, "works");
     }
 
+    @Test
+    public void testCompileStatic9524() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "@groovy.transform.CompileStatic\n" +
+            "class W {\n" +
+            "  enum X {\n" +
+            "        Y {\n" +
+            "      def z() {\n" +
+            "        truncate('123', 2)\n" +
+            "      }\n" +
+            "    }\n" +
+            "    abstract def z()\n" +
+            "    private String truncate(String input, int maxLength) {\n" +
+            "      input.substring(0, maxLength)\n" +
+            "    }\n" +
+            "  }\n" +
+            "}\n" +
+            "print W.X.Y.z()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "12");
+    }
+
     @Test
     public void testCompileStatic9555() {
         //@formatter:off

diff --git a/...org.codehaus.groovy25/src/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/...org.codehaus.groovy25/src/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
@@ -242,6 +242,9 @@ protected boolean tryBridgeMethod(MethodNode target, Expression receiver, boolea
             Expression fixedReceiver = receiver;
             if (implicitThis) {
                 if (!controller.isInClosure()) {
+                    // GRECLIPSE add -- GROOVY-9524
+                    if (!thisClass.isDerivedFrom(lookupClassNode))
+                    // GRECLIPSE end
                     fixedReceiver = new PropertyExpression(new ClassExpression(lookupClassNode), "this");
                 } else if (thisClass != null) {
                     ClassNode current = thisClass.getOuterClass();

diff --git a/...org.codehaus.groovy30/src/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/...org.codehaus.groovy30/src/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
@@ -246,6 +246,9 @@ protected boolean tryBridgeMethod(final MethodNode target, final Expression rece
             Expression fixedReceiver = receiver;
             if (implicitThis) {
                 if (!controller.isInGeneratedFunction()) {
+                    // GRECLIPSE add -- GROOVY-9524
+                    if (!thisClass.isDerivedFrom(lookupClassNode))
+                    // GRECLIPSE end
                     fixedReceiver = propX(classX(lookupClassNode), "this");
                 } else if (thisClass != null) {
                     ClassNode current = thisClass.getOuterClass();

diff --git a/...org.codehaus.groovy40/src/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java b/...org.codehaus.groovy40/src/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java
@@ -248,6 +248,9 @@ protected boolean tryBridgeMethod(final MethodNode target, final Expression rece
             Expression fixedReceiver = receiver;
             if (implicitThis) {
                 if (!controller.isInGeneratedFunction()) {
+                    // GRECLIPSE add -- GROOVY-9524
+                    if (!thisClass.isDerivedFrom(lookupClassNode))
+                    // GRECLIPSE end
                     fixedReceiver = propX(classX(lookupClassNode), "this");
                 } else if (thisClass != null) {
                     ClassNode current = thisClass.getOuterClass();