GROOVY-11764: do not visit super class field if it is package-private

Author: eric-milles

src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java

@@ -133,6 +133,7 @@
 import static org.codehaus.groovy.ast.tools.GeneralUtils.classX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.fieldX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.getSetterName;
+import static org.codehaus.groovy.ast.tools.GeneralUtils.inSamePackage;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.isOrImplements;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.propX;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.thisPropX;
@@ -1109,9 +1110,10 @@ public void visitPropertyExpression(final PropertyExpression expression) {
                     }
                 } else {
                     fieldNode = classNode.getSuperClass().getDeclaredField(name);
-                    // GROOVY-4497: do not visit super class field if it is private
-                    if (fieldNode != null && fieldNode.isPrivate()) fieldNode = null;
-
+                    // GROOVY-4497, GROOVY-11764: do not visit super class field if it is private or package-private
+                    if (fieldNode != null && (fieldNode.isPrivate() || !(fieldNode.isPublic() || fieldNode.isProtected() || inSamePackage(classNode, classNode.getSuperClass())))) {
+                        fieldNode = null;
+                    }
                     if (fieldNode == null) {
                         visited = tryPropertyOfSuperClass(expression, name);
                     }

src/test/groovy/bugs/Groovy11764.groovy

@@ -0,0 +1,48 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package bugs
+
+import org.junit.Test
+
+final class Groovy11764 {
+
+    @Test
+    void testReadFieldPropertyShadowing() {
+        def shell = new GroovyShell()
+        shell.parse '''package p
+            class A {
+                Number getValue() {
+                    42
+                }
+            }
+            class B extends A {
+                @groovy.transform.PackageScope String value = 'xx'
+            }
+        '''
+        shell.evaluate '''
+            class C extends p.B {
+                void test() {
+                    assert super.value == 42
+                }
+            }
+
+            new C().test()
+        '''
+    }
+}