GROOVY-6183

eric-milles · eric-milles · commit 9d28ea6cc490 · 2021-02-25T14:25:42.000-06:00
diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java
@@ -547,6 +547,22 @@ public void testStaticProperty2() {
         runConformTest(sources, "");
     }
 
+    @Test
+    public void testStaticProperty2a() {
+        //@formatter:off
+        String[] sources = {
+            "Main.groovy",
+            "class Main {\n" +
+            "  static main(args) {\n" +
+            "    this.@x\n" +
+            "  }\n" +
+            "}\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "", "java.lang.IncompatibleClassChangeError: Class java.lang.Class does not implement the requested interface groovy.lang.GroovyObject");
+    }
+
     @Test // GROOVY-8385
     public void testStaticProperty3() {
         //@formatter:off
diff --git a/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java b/base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -1039,9 +1039,8 @@ private void visitAttributeOrProperty(PropertyExpression expression, MethodCalle
                         field = classNode.getDeclaredField(name);
                         if (field == null && controller.isStaticContext()
                                 && expression instanceof AttributeExpression) {
-                            // GROOVY-6183: checks supers
-                            field = classNode.getField(name);
-                            if (!field.isPublic() && !field.isProtected()) {
+                            field = classNode.getField(name); // GROOVY-6183: check supers
+                            if (field != null && !field.isPublic() && !field.isProtected()) {
                                 field = null;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -1039,9 +1039,8 @@ private void visitAttributeOrProperty(PropertyExpression expression, MethodCalle`
`1039`	`1039`	`field = classNode.getDeclaredField(name);`
`1040`	`1040`	`if (field == null && controller.isStaticContext()`
`1041`	`1041`	`&& expression instanceof AttributeExpression) {`
`1042`		`- // GROOVY-6183: checks supers`
`1043`		`- field = classNode.getField(name);`
`1044`		`- if (!field.isPublic() && !field.isProtected()) {`
	`1042`	`+ field = classNode.getField(name); // GROOVY-6183: check supers`
	`1043`	`+ if (field != null && !field.isPublic() && !field.isProtected()) {`
`1045`	`1044`	`field = null;`
`1046`	`1045`	`}`
`1047`	`1046`	`}`