[groovy] branch danielsun/jointcompilation-20200516 created (now 704c773)

[su...@apache.org]

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

sunlan pushed a change to branch danielsun/jointcompilation-20200516
in repository https://gitbox.apache.org/repos/asf/groovy.git.


      at 704c773  GROOVY-9556: Stub generated does not contain the effect of AST transformation during joint compilation

This branch includes the following new commits:

     new 704c773  GROOVY-9556: Stub generated does not contain the effect of AST transformation during joint compilation

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[groovy] 01/01: GROOVY-9556: Stub generated does not contain the effect of AST transformation during joint compilation

[su...@apache.org]

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

sunlan pushed a commit to branch danielsun/jointcompilation-20200516
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 704c77333a8a6053cdc5c6f84f0f3ee268329018
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat May 16 11:18:27 2020 +0800

    GROOVY-9556: Stub generated does not contain the effect of AST transformation during joint compilation
---
 .../tools/javac/JavaAwareCompilationUnit.java      |  2 +-
 src/test/groovy/bugs/Groovy9556.groovy             | 83 ++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java b/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
index d2b7800..d172df7 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
@@ -101,7 +101,7 @@ public class JavaAwareCompilationUnit extends CompilationUnit {
             } catch (FileNotFoundException fnfe) {
                 source.addException(fnfe);
             }
-        }, Phases.CONVERSION);
+        }, Phases.INSTRUCTION_SELECTION);
     }
 
     @Override
diff --git a/src/test/groovy/bugs/Groovy9556.groovy b/src/test/groovy/bugs/Groovy9556.groovy
new file mode 100644
index 0000000..7e8c764
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9556.groovy
@@ -0,0 +1,83 @@
+/*
+ *  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 groovy.bugs
+
+import org.codehaus.groovy.control.CompilerConfiguration
+import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
+import org.junit.Test
+
+final class Groovy9556 {
+// .\gradlew --no-daemon --max-workers 2 :test --tests groovy.bugs.Groovy9556 --debug-jvm
+    @Test
+    void testInheritConstructors() {
+        def config = new CompilerConfiguration(
+            targetDirectory: File.createTempDir(),
+            jointCompilationOptions: [memStub: true]
+        )
+
+        def parentDir = File.createTempDir()
+
+        try {
+            def a = new File(parentDir, 'CreateSignatureBase.java')
+            a.write '''
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+
+public abstract class CreateSignatureBase implements SignatureInterface
+{
+    public CreateSignatureBase(KeyStore keystore, char[] pin)
+            throws KeyStoreException, UnrecoverableKeyException, NoSuchAlgorithmException, IOException, CertificateException
+    { }
+    @Override
+    public byte[] sign(InputStream content) throws IOException
+    {
+        return null;
+    }
+}
+
+interface SignatureInterface {
+    byte[] sign(InputStream content) throws IOException;
+}
+            '''
+            def b = new File(parentDir, 'B.groovy')
+            b.write '''
+import groovy.transform.*
+
+@InheritConstructors class CreateSignature extends CreateSignatureBase {
+    void signPDF(String pdDocument, String out) {
+
+    }
+}
+            '''
+
+            def loader = new GroovyClassLoader(this.class.classLoader)
+            def cu = new JavaAwareCompilationUnit(config, loader)
+            cu.addSources(a, b)
+            cu.compile()
+        } finally {
+            parentDir.deleteDir()
+            config.targetDirectory.deleteDir()
+        }
+    }
+}