GROOVY-9791

Author: eric-milles

base/org.codehaus.groovy25/src/org/codehaus/groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java

@@ -60,6 +60,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.apache.groovy.ast.tools.ExpressionUtils.isThisExpression;
@@ -83,7 +84,6 @@
 import static org.codehaus.groovy.ast.ClassHelper.int_TYPE;
 import static org.codehaus.groovy.ast.ClassHelper.isPrimitiveType;
 import static org.codehaus.groovy.ast.ClassHelper.make;
-import static org.codehaus.groovy.classgen.AsmClassGenerator.samePackages;
 import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.chooseBestMethod;
 import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.findDGMMethodsByNameAndArguments;
 import static org.codehaus.groovy.transform.stc.StaticTypeCheckingSupport.implementsInterfaceOrIsSubclassOf;
@@ -625,6 +625,7 @@ boolean makeGetField(final Expression receiver, final ClassNode receiverType, fi
     }
 
     private static boolean isDirectAccessAllowed(FieldNode field, ClassNode receiver) {
+        /* GRECLIPSE edit -- GROOVY-9791
         ClassNode declaringClass = field.getDeclaringClass().redirect();
         ClassNode receiverType = receiver.redirect();
 
@@ -643,6 +644,26 @@ private static boolean isDirectAccessAllowed(FieldNode field, ClassNode receiver
 
         // finally public and visible
         return field.isPublic() || samePackages(receiver.getPackageName(), declaringClass.getPackageName());
+        */
+        // a public field is accessible from anywhere
+        if (field.isPublic()) return true;
+
+        ClassNode declaringType = field.getDeclaringClass().redirect();
+
+        // any field is accessible from the declaring class
+        if (receiver.equals(declaringType)) return true;
+
+        // a private field isn't accessible beyond the declaring class
+        if (field.isPrivate()) return false;
+
+        // a protected field is accessible from any subclass of the declaring class
+        if (field.isProtected() && receiver.isDerivedFrom(declaringType)) return true;
+
+        // a protected or package-private field is accessible from the declaring package
+        if (Objects.equals(receiver.getPackageName(), declaringType.getPackageName())) return true;
+
+        return false;
+        // GRECLIPSE end
     }
 
     @Override

base/org.codehaus.groovy30/.checkstyle

@@ -47,7 +47,7 @@
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticInvocationWriter.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticPropertyAccessHelper.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticTypesBinaryExpressionMultiTypeDispatcher.java" include-pattern="false" />
-        <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java" include-pattern="false" />
+        <file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticTypes(CallSite|MethodReferenceExpression)Writer.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/control/CompilationUnit.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/control/CompilerConfiguration.java" include-pattern="false" />
         <file-match-pattern match-pattern="groovy/control/ErrorCollector.java" include-pattern="false" />