[groovy] branch GROOVY_2_5_X updated: GROOVY-9506: Joint compilation is broken for AutoImplement

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch GROOVY_2_5_X
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/GROOVY_2_5_X by this push:
     new 548eb1b  GROOVY-9506: Joint compilation is broken for AutoImplement
548eb1b is described below

commit 548eb1b1f68d75f30c98fb1bfcadc76b1a4bff42
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed May 13 10:18:58 2020 +1000

    GROOVY-9506: Joint compilation is broken for AutoImplement
---
 .../transform/AutoImplementASTTransformation.java  |  3 +-
 .../AutoImplementWithJointCompilation.groovy       | 50 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
index 4db9fe0..a74c480 100644
--- a/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/AutoImplementASTTransformation.java
@@ -131,7 +131,8 @@ public class AutoImplementASTTransformation extends AbstractASTTransformation {
             Map<String, ClassNode> updatedGenericsSpec = new HashMap<String, ClassNode>(genericsSpec);
             while (!interfaces.isEmpty()) {
                 ClassNode origInterface = interfaces.remove(0);
-                if (!origInterface.equals(ClassHelper.OBJECT_TYPE)) {
+                // ignore java.lang.Object; also methods added by Verifier for GroovyObject are already good enough
+                if (!origInterface.equals(ClassHelper.OBJECT_TYPE) && !origInterface.equals(ClassHelper.GROOVY_OBJECT_TYPE)) {
                     updatedGenericsSpec = createGenericsSpec(origInterface, updatedGenericsSpec);
                     ClassNode correctedInterface = correctToGenericsSpecRecurse(updatedGenericsSpec, origInterface);
                     for (MethodNode nextMethod : correctedInterface.getMethods()) {
diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/AutoImplementWithJointCompilation.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/AutoImplementWithJointCompilation.groovy
new file mode 100644
index 0000000..9cbefa6
--- /dev/null
+++ b/src/test/org/codehaus/groovy/tools/stubgenerator/AutoImplementWithJointCompilation.groovy
@@ -0,0 +1,50 @@
+/*
+ *  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 org.codehaus.groovy.tools.stubgenerator
+
+/**
+ * Checks that {@code @AutoImplement} annotated classes work correctly with stubs.
+ */
+class AutoImplementWithJointCompilation extends StringSourcesStubTestCase {
+
+    Map<String, String> provideSources() {
+        [
+                'foo/JavaI.java': '''package foo;
+                    public interface JavaI {}
+                ''',
+                'foo/GroovyClass.groovy': '''package foo
+                    @groovy.transform.AutoImplement
+                    class GroovyClass implements Runnable {}
+                ''',
+                'foo/Main.groovy': '''package foo
+                    class Main {
+                        boolean runGroovyClass() {
+                            new GroovyClass().run()
+                            return true
+                        }
+                    }
+                '''
+        ]
+    }
+
+    void verifyStubs() {
+        def main = loader.loadClass('foo.Main').newInstance()
+        assert main.runGroovyClass()
+    }
+}