Merge pull request #148 from dmitri-gb/master

luontola · web-flow · commit f099ac0ac6ca · 2018-11-30T14:03:08.000+02:00
Make Java agent work with JDK 9+
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_7_0.xml b/.idea/libraries/Maven__org_ow2_asm_asm_7_0.xml
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_debug_all_5_2.xml b/.idea/libraries/Maven__org_ow2_asm_asm_debug_all_5_2.xml
diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_0.xml b/.idea/libraries/Maven__org_ow2_asm_asm_tree_7_0.xml
diff --git a/end-to-end-tests/end-to-end-tests.iml b/end-to-end-tests/end-to-end-tests.iml
@@ -14,7 +14,8 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-debug-all:5.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.bcel:bcel:5.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: jakarta-regexp:jakarta-regexp:1.4" level="project" />
     <orderEntry type="module-library">
diff --git a/end-to-end-tests/pom.xml b/end-to-end-tests/pom.xml
@@ -30,7 +30,13 @@
 
         <dependency>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-debug-all</artifactId>
+            <artifactId>asm</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -85,8 +85,14 @@
 
             <dependency>
                 <groupId>org.ow2.asm</groupId>
-                <artifactId>asm-debug-all</artifactId>
-                <version>5.2</version>
+                <artifactId>asm</artifactId>
+                <version>7.0</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-tree</artifactId>
+                <version>7.0</version>
             </dependency>
 
             <dependency>
@@ -312,7 +318,7 @@
 
                 <plugin>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>3.4</version>
+                    <version>3.6.0</version>
                 </plugin>
 
                 <plugin>
diff --git a/retrolambda-maven-plugin/retrolambda-maven-plugin.iml b/retrolambda-maven-plugin/retrolambda-maven-plugin.iml
@@ -13,7 +13,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="retrolambda" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm-debug-all:5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3" level="project" />
     <orderEntry type="module" module-name="retrolambda-api" />
     <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:3.0" level="project" />
diff --git a/retrolambda/pom.xml b/retrolambda/pom.xml
@@ -23,7 +23,12 @@
 
         <dependency>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-debug-all</artifactId>
+            <artifactId>asm</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-tree</artifactId>
         </dependency>
 
         <dependency>
@@ -50,6 +55,7 @@
                             <mainClass>net.orfjackal.retrolambda.Main</mainClass>
                         </manifest>
                         <manifestEntries>
+                            <Can-Retransform-Classes>true</Can-Retransform-Classes>
                             <Premain-Class>net.orfjackal.retrolambda.PreMain</Premain-Class>
                         </manifestEntries>
                     </archive>
diff --git a/retrolambda/retrolambda.iml b/retrolambda/retrolambda.iml
@@ -11,7 +11,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="retrolambda-api" />
-    <orderEntry type="library" name="Maven: org.ow2.asm:asm-debug-all:5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm-tree:7.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
     <orderEntry type="library" name="Maven: com.esotericsoftware:minlog:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/Agent.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/Agent.java
@@ -0,0 +1,36 @@
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
+// This software is released under the Apache License 2.0.
+// The license text is at http://www.apache.org/licenses/LICENSE-2.0
+
+package net.orfjackal.retrolambda;
+
+import net.orfjackal.retrolambda.ext.ow2asm.EnhancedClassReader;
+import net.orfjackal.retrolambda.lambdas.LambdaClassSaver;
+import org.objectweb.asm.ClassReader;
+
+public class Agent {
+
+    private static boolean enabled = false;
+    private static LambdaClassSaver lambdaClassSaver;
+    private static boolean isJavacHacksEnabled;
+
+    public static void enable() {
+        enabled = true;
+    }
+
+    public static boolean isEnabled() {
+        return enabled;
+    }
+
+    public static void setLambdaClassSaver(LambdaClassSaver lambdaClassSaver, boolean isJavacHacksEnabled) {
+        Agent.lambdaClassSaver = lambdaClassSaver;
+        Agent.isJavacHacksEnabled = isJavacHacksEnabled;
+    }
+
+    public static void saveLambda(byte[] bytes) {
+        if (lambdaClassSaver != null) {
+            ClassReader reader = EnhancedClassReader.create(bytes, isJavacHacksEnabled);
+            lambdaClassSaver.saveIfLambda(reader.getClassName(), bytes);
+        }
+    }
+}
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/PreMain.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/PreMain.java
@@ -6,23 +6,23 @@
 
 import net.orfjackal.retrolambda.lambdas.*;
 
+import java.io.File;
 import java.lang.instrument.Instrumentation;
+import java.net.URISyntaxException;
+import java.util.jar.JarFile;
 
 public class PreMain {
 
-    private static final LambdaClassSaverAgent agent = new LambdaClassSaverAgent();
-    private static boolean agentLoaded = false;
+    public static void premain(String agentArgs, Instrumentation inst) throws Exception {
+        // Append the agent JAR to the bootstrap search path so that the instrumented InnerClassLambdaMetaFactory
+        // could refer to Agent.
+        inst.appendToBootstrapClassLoaderSearch(new JarFile(getAgentJarFile()));
 
-    public static void premain(String agentArgs, Instrumentation inst) {
-        inst.addTransformer(agent);
-        agentLoaded = true;
+        inst.addTransformer(new InnerClassLambdaMetafactoryTransformer(), true);
+        inst.retransformClasses(Class.forName("java.lang.invoke.InnerClassLambdaMetafactory"));
     }
 
-    public static boolean isAgentLoaded() {
-        return agentLoaded;
-    }
-
-    public static void setLambdaClassSaver(LambdaClassSaver lambdaClassSaver, boolean isJavacHacksEnabled) {
-        agent.setLambdaClassSaver(lambdaClassSaver, isJavacHacksEnabled);
+    private static File getAgentJarFile() throws URISyntaxException {
+        return new File(PreMain.class.getProtectionDomain().getCodeSource().getLocation().toURI());
     }
 }
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/Retrolambda.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/Retrolambda.java
@@ -45,7 +45,7 @@ public static void run(Config config) throws Throwable {
         Log.info("Classpath:        " + classpath);
         Log.info("Included files:   " + (includedFiles != null ? includedFiles.size() : "all"));
         Log.info("JVM version:      " + System.getProperty("java.version"));
-        Log.info("Agent enabled:    " + PreMain.isAgentLoaded());
+        Log.info("Agent enabled:    " + Agent.isEnabled());
         Log.info("javac hacks:      " + isJavacHacksEnabled);
 
         if (!Files.isDirectory(inputDir)) {
@@ -61,8 +61,8 @@ public static void run(Config config) throws Throwable {
         LambdaClassSaver lambdaClassSaver = new LambdaClassSaver(outputDirectory, transformers, isJavacHacksEnabled);
 
         try (LambdaClassDumper dumper = new LambdaClassDumper(lambdaClassSaver)) {
-            if (PreMain.isAgentLoaded()) {
-                PreMain.setLambdaClassSaver(lambdaClassSaver, isJavacHacksEnabled);
+            if (Agent.isEnabled()) {
+                Agent.setLambdaClassSaver(lambdaClassSaver, isJavacHacksEnabled);
             } else {
                 dumper.install();
             }
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/InnerClassLambdaMetafactoryTransformer.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/InnerClassLambdaMetafactoryTransformer.java
@@ -0,0 +1,61 @@
+// Copyright © 2013-2018 Esko Luontola and other Retrolambda contributors
+// This software is released under the Apache License 2.0.
+// The license text is at http://www.apache.org/licenses/LICENSE-2.0
+
+package net.orfjackal.retrolambda.lambdas;
+
+import com.esotericsoftware.minlog.Log;
+import net.orfjackal.retrolambda.Agent;
+import org.objectweb.asm.*;
+
+import java.lang.instrument.*;
+import java.security.ProtectionDomain;
+
+public class InnerClassLambdaMetafactoryTransformer implements ClassFileTransformer {
+    @Override
+    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] bytes) throws IllegalClassFormatException {
+        if (!"java/lang/invoke/InnerClassLambdaMetafactory".equals(className)) {
+            return null;
+        }
+
+        try {
+            byte[] transformed = transformMetafactory(bytes);
+            Agent.enable();
+            return transformed;
+        } catch (Throwable e) {
+            Log.error("Failed to transform " + className, e);
+            return null;
+        }
+    }
+
+    private byte[] transformMetafactory(byte[] bytes) {
+        ClassReader cr = new ClassReader(bytes);
+        ClassWriter cw = new ClassWriter(cr, 0);
+        ClassVisitor cv = new ClassVisitor(Opcodes.ASM7, cw) {
+            @Override
+            public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+                MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
+                if (name.equals("spinInnerClass")) {
+                    mv = new MethodVisitor(Opcodes.ASM7, mv) {
+                        @Override
+                        public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
+                            super.visitMethodInsn(opcode, owner, name, desc, itf);
+                            if (name.equals("toByteArray")) {
+                                mv.visitInsn(Opcodes.DUP);
+                                mv.visitMethodInsn(Opcodes.INVOKESTATIC, Type.getInternalName(Agent.class), "saveLambda", "([B)V", false);
+                            }
+                        }
+
+                        @Override
+                        public void visitMaxs(int maxStack, int maxLocals) {
+                            super.visitMaxs(maxStack + 1, maxLocals);
+                        }
+                    };
+                }
+                return mv;
+            }
+        };
+        cr.accept(cv, 0);
+        return cw.toByteArray();
+    }
+}
diff --git a/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaverAgent.java b/retrolambda/src/main/java/net/orfjackal/retrolambda/lambdas/LambdaClassSaverAgent.java
