GROOVY-10319

Author: eric-milles

base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/StaticCompilationTests.java

@@ -6392,4 +6392,28 @@ public void testCompileStatic10282() {
 
         runConformTest(sources, "----------");
     }
+
+    @Test
+    public void testCompileStatic10319() {
+        //@formatter:off
+        String[] sources = {
+            "p/Main.groovy",
+            "package p\n" +
+            "@groovy.transform.ToString(includeFields=true)\n" +
+            "@groovy.transform.CompileStatic\n" +
+            "class C implements Cloneable {\n" +
+            "  private int[] array = [1]\n" +
+            "  @Override\n" +
+            "  C clone() {\n" +
+            "    C c = (C) super.clone()\n" +
+            "    c.array = array.clone()\n" +
+            "    return c\n" +
+            "  }\n" +
+            "}\n" +
+            "print new C().clone()\n",
+        };
+        //@formatter:on
+
+        runConformTest(sources, "p.C([1])");
+    }
 }

base/org.codehaus.groovy25/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -5557,6 +5557,18 @@ protected boolean areCategoryMethodCalls(final List<MethodNode> foundMethods, fi
      * @return the methods that are defined on the receiver completed with stubs for future methods
      */
     protected List<MethodNode> findMethodsWithGenerated(ClassNode receiver, String name) {
+        // GRECLIPSE add -- GROOVY-10319
+        if (receiver.isArray()) {
+            if (name.equals("clone")) {
+                MethodNode clone = new MethodNode("clone", Opcodes.ACC_PUBLIC, OBJECT_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, null);
+                clone.setDeclaringClass(OBJECT_TYPE); // retain Object for declaringClass and returnType
+                clone.setNodeMetaData(StaticTypesMarker.INFERRED_RETURN_TYPE, receiver);
+                return Collections.singletonList(clone);
+            } else {
+                return OBJECT_TYPE.getMethods(name);
+            }
+        }
+        // GRECLIPSE end
         List<MethodNode> methods = receiver.getMethods(name);
         // GRECLIPSE add -- GROOVY-9890
         if (receiver.isAbstract()) {

base/org.codehaus.groovy30/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -5236,6 +5236,18 @@ protected boolean areCategoryMethodCalls(final List<MethodNode> foundMethods, fi
      * @return the methods that are defined on the receiver completed with stubs for future methods
      */
     protected List<MethodNode> findMethodsWithGenerated(final ClassNode receiver, final String name) {
+        // GRECLIPSE add -- GROOVY-10319
+        if (receiver.isArray()) {
+            if (name.equals("clone")) {
+                MethodNode clone = new MethodNode("clone", Opcodes.ACC_PUBLIC, OBJECT_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, null);
+                clone.setDeclaringClass(OBJECT_TYPE); // retain Object for declaringClass and returnType
+                clone.setNodeMetaData(INFERRED_RETURN_TYPE, receiver);
+                return Collections.singletonList(clone);
+            } else {
+                return OBJECT_TYPE.getMethods(name);
+            }
+        }
+        // GRECLIPSE end
         List<MethodNode> methods = receiver.getMethods(name);
         if (receiver.isAbstract()) {
             collectAllInterfaceMethodsByName(receiver, name, methods);

base/org.codehaus.groovy40/src/org/codehaus/groovy/classgen/asm/sc/StaticInvocationWriter.java

@@ -629,10 +629,11 @@ public void makeCall(final Expression origin, final Expression receiver, final E
                     origMCE.getArguments()
             );
             MethodNode methodTarget = origMCE.getMethodTarget();
+            newMCE.setImplicitThis(origMCE.isImplicitThis());
             newMCE.setMethodTarget(methodTarget);
             newMCE.setSafe(false);
-            newMCE.setImplicitThis(origMCE.isImplicitThis());
             newMCE.setSourcePosition(origMCE);
+            newMCE.getObjectExpression().setSourcePosition(origMCE.getObjectExpression());
             newMCE.visit(controller.getAcg());
             compileStack.removeVar(slot.getIndex());
             ClassNode returnType = operandStack.getTopOperand();

base/org.codehaus.groovy40/src/org/codehaus/groovy/transform/stc/StaticTypeCheckingVisitor.java

@@ -4892,6 +4892,17 @@ protected boolean areCategoryMethodCalls(final List<MethodNode> foundMethods, fi
      * @return the methods that are defined on the receiver completed with stubs for future methods
      */
     protected List<MethodNode> findMethodsWithGenerated(final ClassNode receiver, final String name) {
+        if (receiver.isArray()) {
+            if (name.equals("clone")) { // GROOVY-10319: array clone -- <https://docs.oracle.com/javase/specs/jls/se8/html/jls-10.html#jls-10.7>
+                MethodNode clone = new MethodNode("clone", Opcodes.ACC_PUBLIC, OBJECT_TYPE, Parameter.EMPTY_ARRAY, ClassNode.EMPTY_ARRAY, null);
+                clone.setDeclaringClass(OBJECT_TYPE); // retain Object for declaringClass and returnType
+                clone.setNodeMetaData(INFERRED_RETURN_TYPE, receiver);
+                return Collections.singletonList(clone);
+            } else {
+                return OBJECT_TYPE.getMethods(name);
+            }
+        }
+
         List<MethodNode> methods = receiver.getMethods(name);
         if (receiver.isAbstract()) {
             collectAllInterfaceMethodsByName(receiver, name, methods);