You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/05/16 08:20:31 UTC
[groovy] branch danielsun/jointcompilation-20200516 updated
(2f7a956 -> 43ba5f8)
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.
discard 2f7a956 Add a test for GROOVY-9556
new 43ba5f8 GROOVY-9556: Stub generated without the effect of AST transformation makes joint compilation fail
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2f7a956)
\
N -- N -- N refs/heads/danielsun/jointcompilation-20200516 (43ba5f8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
.../groovy/tools/javac/JavaAwareCompilationUnit.java | 1 +
.../codehaus/groovy/tools/javac/JavacJavaCompiler.java | 16 ++++++++++++++++
src/test/groovy/bugs/Groovy9556.groovy | 3 ++-
3 files changed, 19 insertions(+), 1 deletion(-)
[groovy] 01/01: GROOVY-9556: Stub generated without the effect of
AST transformation makes joint compilation fail
Posted by 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 43ba5f8eb393d9090b0bc7c0f13c69281e0a3175
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat May 16 16:13:45 2020 +0800
GROOVY-9556: Stub generated without the effect of AST transformation makes joint compilation fail
---
.../tools/javac/JavaAwareCompilationUnit.java | 1 +
.../groovy/tools/javac/JavacJavaCompiler.java | 16 +++++
src/test/groovy/bugs/Groovy9556.groovy | 84 ++++++++++++++++++++++
3 files changed, 101 insertions(+)
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..cce5faf 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
@@ -74,6 +74,7 @@ public class JavaAwareCompilationUnit extends CompilationUnit {
Object memStub = options.get(CompilerConfiguration.MEM_STUB);
if (memStub == null) {
memStub = SystemUtil.getSystemPropertySafe("groovy.generate.stub.in.memory", "false");
+ options.put(CompilerConfiguration.MEM_STUB, Boolean.parseBoolean((String) memStub));
}
this.keepStubs = Boolean.TRUE.equals(options.get("keepStubs"));
diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java b/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
index cb35ad2..a31fe2d 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavacJavaCompiler.java
@@ -21,6 +21,7 @@ package org.codehaus.groovy.tools.javac;
import groovy.lang.GroovyClassLoader;
import groovy.lang.GroovyObject;
import org.apache.groovy.io.StringBuilderWriter;
+import org.codehaus.groovy.GroovyBugError;
import org.codehaus.groovy.control.CompilationUnit;
import org.codehaus.groovy.control.CompilerConfiguration;
import org.codehaus.groovy.control.messages.ExceptionMessage;
@@ -38,6 +39,7 @@ import java.security.CodeSource;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -93,6 +95,20 @@ public class JavacJavaCompiler implements JavaCompiler {
try (javax.tools.StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, DEFAULT_LOCALE, charset)) {
Set<javax.tools.JavaFileObject> compilationUnitSet = cu.getJavaCompilationUnitSet(); // java stubs already added
+ Map<String, Object> options = this.config.getJointCompilationOptions();
+ if (!Boolean.parseBoolean(options.get(CompilerConfiguration.MEM_STUB).toString())) {
+ // clear the java stubs in the source set of Java compilation
+ compilationUnitSet = new HashSet<>();
+
+ // use sourcepath to specify the root directory of java stubs
+ javacParameters.add("-sourcepath");
+ final File stubDir = (File) options.get("stubDir");
+ if (null == stubDir) {
+ throw new GroovyBugError("stubDir is not specified");
+ }
+ javacParameters.add(stubDir.getAbsolutePath());
+ }
+
// add java source files to compile
fileManager.getJavaFileObjectsFromFiles(
files.stream().map(File::new).collect(Collectors.toList())
diff --git a/src/test/groovy/bugs/Groovy9556.groovy b/src/test/groovy/bugs/Groovy9556.groovy
new file mode 100644
index 0000000..978c1d6
--- /dev/null
+++ b/src/test/groovy/bugs/Groovy9556.groovy
@@ -0,0 +1,84 @@
+/*
+ * 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: false]
+ )
+
+ def parentDir = File.createTempDir()
+ config.jointCompilationOptions.stubDir = parentDir
+
+ 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()
+ }
+ }
+}