GROOVY-8448

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/InnerClassTests.java

@@ -1786,6 +1786,24 @@ public void testAnonymousInnerClass34() {
         runConformTest(sources);
     }
 
+    @Test // GROOVY-8488
+    public void testAnonymousInnerClass35() {
+        //@formatter:off
+        String[] sources = {
+            "Script.groovy",
+            "def x = 'local'\n" + // shared variable written as field in AIC
+            "new Runnable() {\n" +
+            "  def getX() { 'getter' }\n" +
+            "  @Override void run() {\n" +
+            "    print x + ' then ' + this.x\n" +
+            "  }\n" +
+            "}.run()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "local then getter");
+    }
+
     @Test
     public void testMixedModeInnerProperties_GRE597() {
         //@formatter:off

base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/AsmClassGenerator.java

@@ -1083,6 +1083,12 @@ private void visitAttributeOrProperty(PropertyExpression expression, MethodCalle
                             field = classNode.getDeclaredField(name); // params are stored as fields
                     } else {
                         field = classNode.getDeclaredField(name);
+                        // GRECLIPSE add -- GROOVY-8448: "this.name" from inner class
+                        if (field != null && (field.getModifiers() & ACC_SYNTHETIC) != 0
+                                && field.getType().equals(ClassHelper.REFERENCE_TYPE) && !expression.isImplicitThis()) {
+                            field = null;
+                        }
+                        // GRECLIPSE end
                         if (field == null && controller.isStaticContext()
                                 && expression instanceof AttributeExpression) {
                             field = classNode.getField(name); // GROOVY-6183: check supers

base/org.codehaus.groovy30/src/org/codehaus/groovy/classgen/AsmClassGenerator.java

@@ -1134,6 +1134,12 @@ public void visitPropertyExpression(final PropertyExpression expression) {
                         if (expression.isImplicitThis()) fieldNode = classNode.getDeclaredField(name);
                     } else {
                         fieldNode = classNode.getDeclaredField(name);
+                        // GRECLIPSE add -- GROOVY-8448: "this.name" from inner class
+                        if (fieldNode != null && (fieldNode.getModifiers() & ACC_SYNTHETIC) != 0
+                                && fieldNode.getType().equals(ClassHelper.REFERENCE_TYPE) && !expression.isImplicitThis()) {
+                            fieldNode = null;
+                        }
+                        // GRECLIPSE end
                     }
                     if (fieldNode == null && !isValidFieldNodeForByteCodeAccess(getField(classNode, name), classNode)) {
                         // GROOVY-9501, GROOVY-9569, GROOVY-9650, GROOVY-9655, GROOVY-9665, GROOVY-9683, GROOVY-9695

base/org.codehaus.groovy40/.checkstyle

@@ -36,6 +36,7 @@
         <file-match-pattern match-pattern="groovy/ast/expr/(Static)?MethodCallExpression.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/ast/tools/(Expression|Generics)Utils.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/(Annotation|Enum)Visitor.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/AsmClassGenerator.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/(Extended)?Verifier.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/WriterController.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticInvocationWriter.java" include-pattern="false" />