GROOVY-6954, GROOVY-11376

eric-milles · eric-milles · commit 972d34ab7b4c · 2024-05-14T11:30:07.000-05:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java
@@ -1317,6 +1317,41 @@ public void testCompileStatic6904() {
         runConformTest(sources, "works");
     }
 
+    @Test
+    public void testCompileStatic6954() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "import groovy.transform.*\n" +
+            "@CompileStatic class C extends HashMap<String,String> {\n" +
+            "  def           a\n" +
+            "  public        b\n" +
+            "  protected     c\n" +
+            "  @PackageScope d\n" +
+            "  private       e\n" +
+            "  C() {\n" +
+            "    this.a = 'a'\n" +
+            "    this.b = 'b'\n" +
+            "    this.c = 'c'\n" +
+            "    this.d = 'd'\n" +
+            "    this.e = 'e'\n" +
+            "    print(this);\n" +
+            "def that = this;\n" +
+            "    that.a = 'a'\n" + // not put
+            "    that.b = 'b'\n" + // not put
+            "    that.c = 'c'\n" + // not put
+            "    that.d = 'd'\n" +
+            "    that.e = 'e'\n" +
+            "    print(that);\n" +
+            "  }\n" +
+            "}\n" +
+            "new C()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "[:][d:d, e:e]");
+    }
+
     @Test
     public void testCompileStatic6921() {
         //@formatter:off
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
@@ -824,8 +824,10 @@ public void fallbackAttributeOrPropertySite(final PropertyExpression expression,
                     }
                 }
             }
-            // GRECLIPSE add -- GROOVY-6954
-            if (isOrImplements(receiverType, MAP_TYPE) && !isClassReceiver[0]) {
+            // GRECLIPSE add -- GROOVY-6954, GROOVY-11376
+            if (!isClassReceiver[0] && isOrImplements(receiverType, MAP_TYPE) &&
+                    !java.util.Optional.ofNullable(getField(receiverType, name))
+                    .filter(f -> f.isPublic() || f.isProtected()).isPresent()) {
                 MethodVisitor mv = controller.getMethodVisitor();
 
                 // store value in temporary variable
diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java
@@ -819,7 +819,13 @@ public void fallbackAttributeOrPropertySite(final PropertyExpression expression,
                     }
                 }
             }
+            /* GRECLIPSE edit -- GROOVY-11376
             if (isOrImplements(receiverType, MAP_TYPE) && !isClassReceiver[0]) {
+            */
+            if (!isClassReceiver[0] && isOrImplements(receiverType, MAP_TYPE) &&
+                    !java.util.Optional.ofNullable(getField(receiverType, name))
+                    .filter(f -> f.isPublic() || f.isProtected()).isPresent()) {
+            // GRECLIPSE end
                 MethodVisitor mv = controller.getMethodVisitor();
 
                 // store value in temporary variable

Original file line number	Diff line number	Diff line change
`@@ -824,8 +824,10 @@ public void fallbackAttributeOrPropertySite(final PropertyExpression expression,`
`824`	`824`	`}`
`825`	`825`	`}`
`826`	`826`	`}`
`827`		`- // GRECLIPSE add -- GROOVY-6954`
`828`		`- if (isOrImplements(receiverType, MAP_TYPE) && !isClassReceiver[0]) {`
	`827`	`+ // GRECLIPSE add -- GROOVY-6954, GROOVY-11376`
	`828`	`+ if (!isClassReceiver[0] && isOrImplements(receiverType, MAP_TYPE) &&`
	`829`	`+ !java.util.Optional.ofNullable(getField(receiverType, name))`
	`830`	`+ .filter(f -> f.isPublic() \|\| f.isProtected()).isPresent()) {`
`829`	`831`	`MethodVisitor mv = controller.getMethodVisitor();`
`830`	`832`
`831`	`833`	`// store value in temporary variable`
Original file line number	Diff line number	Diff line change
`@@ -819,7 +819,13 @@ public void fallbackAttributeOrPropertySite(final PropertyExpression expression,`
`819`	`819`	`}`
`820`	`820`	`}`
`821`	`821`	`}`
	`822`	`+ /* GRECLIPSE edit -- GROOVY-11376`
`822`	`823`	`if (isOrImplements(receiverType, MAP_TYPE) && !isClassReceiver[0]) {`
	`824`	`+ */`
	`825`	`+ if (!isClassReceiver[0] && isOrImplements(receiverType, MAP_TYPE) &&`
	`826`	`+ !java.util.Optional.ofNullable(getField(receiverType, name))`
	`827`	`+ .filter(f -> f.isPublic() \|\| f.isProtected()).isPresent()) {`
	`828`	`+ // GRECLIPSE end`
`823`	`829`	`MethodVisitor mv = controller.getMethodVisitor();`
`824`	`830`
`825`	`831`	`// store value in temporary variable`