-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fixed issue Unsafe#put/getObject methods in Java 11 causing JVM crash.
* Refactored JLink packaging and Phosphor class patching into its * Removed double declaration of compiler plugin from pom.xml * Factored packing of Phosphor into java.base module out of PhosphorJLinkPlugin into new class PhosphorPacker * Factored patching of Phosphor class from Instrumenter into new class PhosphorPatcher * Added Java 11 to workflows
- Loading branch information
1 parent
21b0b87
commit 05fc3d6
Showing
8 changed files
with
263 additions
and
204 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
171 changes: 171 additions & 0 deletions
171
Phosphor/src/main/java/edu/columbia/cs/psl/phosphor/PhosphorPatcher.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| package edu.columbia.cs.psl.phosphor; | ||
|
|
||
| import edu.columbia.cs.psl.phosphor.instrumenter.ConfigurationEmbeddingMV; | ||
| import edu.columbia.cs.psl.phosphor.runtime.jdk.unsupported.UnsafeProxy; | ||
| import org.objectweb.asm.*; | ||
| import org.objectweb.asm.commons.ModuleHashesAttribute; | ||
| import org.objectweb.asm.commons.ModuleResolutionAttribute; | ||
| import org.objectweb.asm.commons.ModuleTargetAttribute; | ||
| import org.objectweb.asm.tree.ClassNode; | ||
| import org.objectweb.asm.tree.MethodNode; | ||
| import org.objectweb.asm.tree.ModuleExportNode; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.util.Set; | ||
|
|
||
| public class PhosphorPatcher { | ||
| private final boolean patchUnsafeNames; | ||
|
|
||
| public PhosphorPatcher(InputStream unsafeContent) throws IOException { | ||
| this.patchUnsafeNames = shouldPatchUnsafeNames(unsafeContent); | ||
| } | ||
|
|
||
| public byte[] patch(String name, byte[] content) throws IOException { | ||
| if (name.equals("edu/columbia/cs/psl/phosphor/Configuration.class")) { | ||
| return setConfigurationVersion(new ByteArrayInputStream(content)); | ||
| } else if (name.equals("edu/columbia/cs/psl/phosphor/runtime/RuntimeJDKInternalUnsafePropagator.class")) { | ||
| return transformUnsafePropagator(new ByteArrayInputStream(content), | ||
| "jdk/internal/misc/Unsafe", patchUnsafeNames); | ||
| } else { | ||
| return content; | ||
| } | ||
| } | ||
|
|
||
| public byte[] transformBaseModuleInfo(InputStream in, Set<String> packages) { | ||
| try { | ||
| ClassNode classNode = new ClassNode(); | ||
| ClassReader cr = new ClassReader(in); | ||
| Attribute[] attributes = new Attribute[]{new ModuleTargetAttribute(), | ||
| new ModuleResolutionAttribute(), | ||
| new ModuleHashesAttribute()}; | ||
| cr.accept(classNode, attributes, 0); | ||
| // Add exports | ||
| for (String packageName : packages) { | ||
| classNode.module.exports.add(new ModuleExportNode(packageName, 0, null)); | ||
| } | ||
| // Add packages | ||
| classNode.module.packages.addAll(packages); | ||
| ClassWriter cw = new ClassWriter(0); | ||
| classNode.accept(cw); | ||
| return cw.toByteArray(); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| private static boolean shouldPatchUnsafeNames(InputStream in) throws IOException { | ||
| ClassNode cn = new ClassNode(); | ||
| new ClassReader(in).accept(cn, 0); | ||
| for (MethodNode mn : cn.methods) { | ||
| if (mn.name.contains("putReference")) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /** | ||
| * Modify {@link Configuration} to set {@link Configuration#IS_JAVA_8} to false. | ||
| * This flag must be set correctly in order to boot the JVM. | ||
| */ | ||
| private static byte[] setConfigurationVersion(InputStream is) throws IOException { | ||
| ClassReader cr = new ClassReader(is); | ||
| ClassWriter cw = new ClassWriter(cr, 0); | ||
| ClassVisitor cv = new ClassVisitor(Configuration.ASM_VERSION, cw) { | ||
| @Override | ||
| public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, | ||
| String[] exceptions) { | ||
| MethodVisitor mv = super.visitMethod(access, name, descriptor, signature, exceptions); | ||
| if (name.equals("<clinit>")) { | ||
| return new ConfigurationEmbeddingMV(mv); | ||
| } else { | ||
| return mv; | ||
| } | ||
| } | ||
| }; | ||
| cr.accept(cv, 0); | ||
| return cw.toByteArray(); | ||
| } | ||
|
|
||
| public static byte[] transformUnsafePropagator(InputStream in, String unsafeInternalName, | ||
| boolean patchUnsafeNames) throws IOException { | ||
| ClassReader cr = new ClassReader(in); | ||
| ClassWriter cw = new ClassWriter(cr, 0); | ||
| ClassVisitor cv = new UnsafePatchingCV(cw, unsafeInternalName, patchUnsafeNames); | ||
| cr.accept(cv, 0); | ||
| return cw.toByteArray(); | ||
| } | ||
|
|
||
| private static class UnsafePatchingCV extends ClassVisitor { | ||
| private static final String UNSAFE_PROXY_INTERNAL_NAME = Type.getInternalName(UnsafeProxy.class); | ||
| private static final String UNSAFE_PROXY_DESC = Type.getDescriptor(UnsafeProxy.class); | ||
| private final String unsafeDesc; | ||
| private final boolean patchNames; | ||
| private final String unsafeInternalName; | ||
|
|
||
| public UnsafePatchingCV(ClassWriter cw, String unsafeInternalName, boolean patchNames) { | ||
| super(Configuration.ASM_VERSION, cw); | ||
| this.unsafeInternalName = unsafeInternalName; | ||
| this.unsafeDesc = "L" + unsafeInternalName + ";"; | ||
| this.patchNames = patchNames; | ||
| } | ||
|
|
||
| private String patchInternalName(String name) { | ||
| return UNSAFE_PROXY_INTERNAL_NAME.equals(name) ? unsafeInternalName : name; | ||
| } | ||
|
|
||
| private String patchDesc(String desc) { | ||
| return desc == null ? null : desc.replace(UNSAFE_PROXY_DESC, unsafeDesc); | ||
| } | ||
|
|
||
| private String patchMethodName(String owner, String name) { | ||
| return patchNames && owner.equals(UNSAFE_PROXY_INTERNAL_NAME) ? | ||
| name.replace("Reference", "Object") : name; | ||
| } | ||
|
|
||
| @Override | ||
| public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) { | ||
| MethodVisitor mv = super.visitMethod(access, name, patchDesc(descriptor), patchDesc(signature), exceptions); | ||
| return new MethodVisitor(api, mv) { | ||
| @Override | ||
| public void visitFrame(int type, int numLocal, Object[] local, int numStack, Object[] stack) { | ||
| for (int i = 0; i < numLocal; i++) { | ||
| if (local[i] instanceof String) { | ||
| local[i] = patchInternalName((String) local[i]); | ||
| } | ||
| } | ||
| for (int i = 0; i < numStack; i++) { | ||
| if (stack[i] instanceof String) { | ||
| stack[i] = patchInternalName((String) stack[i]); | ||
| } | ||
| } | ||
| super.visitFrame(type, numLocal, local, numStack, stack); | ||
| } | ||
|
|
||
| @Override | ||
| public void visitFieldInsn(int opcode, String owner, String name, String descriptor) { | ||
| super.visitFieldInsn(opcode, patchInternalName(owner), name, patchDesc(descriptor)); | ||
| } | ||
|
|
||
| @Override | ||
| public void visitMethodInsn(int opcode, String owner, String name, String descriptor, boolean isInterface) { | ||
| super.visitMethodInsn(opcode, patchInternalName(owner), patchMethodName(owner, name), | ||
| patchDesc(descriptor), isInterface); | ||
| } | ||
|
|
||
| @Override | ||
| public void visitTypeInsn(int opcode, String type) { | ||
| super.visitTypeInsn(opcode, patchInternalName(type)); | ||
| } | ||
|
|
||
| @Override | ||
| public void visitLocalVariable(String name, String descriptor, String signature, Label start, Label end, | ||
| int index) { | ||
| super.visitLocalVariable(name, patchDesc(descriptor), signature, start, end, index); | ||
| } | ||
| }; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.