Merge branch 'shadowLauncher'

3 files changed, 115 insertions, 10 deletions

diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java
new file mode 100644
index 00000000..0d21c212
--- /dev/null
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipseLoaderPatcher.java
@@ -0,0 +1,106 @@
+package lombok.eclipse.agent;
+
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+import lombok.patcher.ClassRootFinder;
+import lombok.patcher.Hook;
+import lombok.patcher.MethodTarget;
+import lombok.patcher.ScriptManager;
+import lombok.patcher.StackRequest;
+import lombok.patcher.scripts.ScriptBuilder;
+
+public class EclipseLoaderPatcher {
+	public static boolean overrideLoadDecide(ClassLoader original, String name, boolean resolve) {
+		return name.startsWith("lombok.");
+	}
+	
+	public static Class<?> overrideLoadResult(ClassLoader original, String name, boolean resolve) throws ClassNotFoundException {
+		try {
+			Field shadowLoaderField = original.getClass().getField("lombok$shadowLoader");
+			ClassLoader shadowLoader = (ClassLoader) shadowLoaderField.get(original);
+			if (shadowLoader == null) {
+				String jarLoc = (String) original.getClass().getField("lombok$location").get(null);
+				JarFile jf = new JarFile(jarLoc);
+				InputStream in = null;
+				try {
+					ZipEntry entry = jf.getEntry("lombok/launch/ShadowClassLoader.class");
+					in = jf.getInputStream(entry);
+					byte[] bytes = new byte[65536];
+					int len = 0;
+					while (true) {
+						int r = in.read(bytes, len, bytes.length - len);
+						if (r == -1) break;
+						len += r;
+						if (len == bytes.length) throw new IllegalStateException("lombok.launch.ShadowClassLoader too large.");
+					}
+					in.close();
+					Class<?> shadowClassLoaderClass; {
+						Method defineClassMethod = ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class, int.class, int.class);
+						defineClassMethod.setAccessible(true);
+						shadowClassLoaderClass = (Class<?>) defineClassMethod.invoke(original, "lombok.launch.ShadowClassLoader", bytes, 0, len);
+					}
+					Constructor<?> constructor = shadowClassLoaderClass.getDeclaredConstructor(ClassLoader.class, String.class, String.class, String[].class);
+					constructor.setAccessible(true);
+					shadowLoader = (ClassLoader) constructor.newInstance(original, "lombok", jarLoc, new String[] {"lombok."});
+					shadowLoaderField.set(original, shadowLoader);
+				} finally {
+					if (in != null) in.close();
+					jf.close();
+				}
+			}
+			
+			if (resolve) {
+				Method m = shadowLoader.getClass().getDeclaredMethod("loadClass", String.class, boolean.class);
+				m.setAccessible(true);
+				return (Class<?>) m.invoke(shadowLoader, name, true);
+			} else {
+				return shadowLoader.loadClass(name);
+			}
+		} catch (Exception ex) {
+			Throwable t = ex;
+			if (t instanceof InvocationTargetException) t = t.getCause();
+			if (t instanceof RuntimeException) throw (RuntimeException) t;
+			if (t instanceof Error) throw (Error) t;
+			throw new RuntimeException(t);
+		}
+	}
+	
+	private static final String SELF_NAME = "lombok.eclipse.agent.EclipseLoaderPatcher";
+	
+	public static void patchEquinoxLoaders(ScriptManager sm, Class<?> launchingContext) {
+		sm.addScript(ScriptBuilder.exitEarly()
+				.target(new MethodTarget("org.eclipse.osgi.internal.baseadaptor.DefaultClassLoader", "loadClass",
+						"java.lang.Class", "java.lang.String", "boolean"))
+				.target(new MethodTarget("org.eclipse.osgi.framework.adapter.core.AbstractClassLoader", "loadClass",
+						"java.lang.Class", "java.lang.String", "boolean"))
+				.target(new MethodTarget("org.eclipse.osgi.internal.loader.ModuleClassLoader", "loadClass",
+						"java.lang.Class", "java.lang.String", "boolean"))
+				.decisionMethod(new Hook(SELF_NAME, "overrideLoadDecide", "boolean", "java.lang.ClassLoader", "java.lang.String", "boolean"))
+				.valueMethod(new Hook(SELF_NAME, "overrideLoadResult", "java.lang.Class", "java.lang.ClassLoader", "java.lang.String", "boolean"))
+				.transplant()
+				.request(StackRequest.THIS, StackRequest.PARAM1, StackRequest.PARAM2).build());
+		
+		sm.addScript(ScriptBuilder.addField().setPublic()
+				.fieldType("Ljava/lang/ClassLoader;")
+				.fieldName("lombok$shadowLoader")
+				.targetClass("org.eclipse.osgi.internal.baseadaptor.DefaultClassLoader")
+				.targetClass("org.eclipse.osgi.framework.adapter.core.AbstractClassLoader")
+				.targetClass("org.eclipse.osgi.internal.loader.ModuleClassLoader")
+				.build());
+		
+		sm.addScript(ScriptBuilder.addField().setPublic().setStatic().setFinal()
+				.fieldType("Ljava/lang/String;")
+				.fieldName("lombok$location")
+				.targetClass("org.eclipse.osgi.internal.baseadaptor.DefaultClassLoader")
+				.targetClass("org.eclipse.osgi.framework.adapter.core.AbstractClassLoader")
+				.targetClass("org.eclipse.osgi.internal.loader.ModuleClassLoader")
+				.value(ClassRootFinder.findClassRootOfClass(launchingContext))
+				.build());
+	}
+}
diff --git a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
index e14d1367..96f253f2 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/EclipsePatcher.java
@@ -28,13 +28,13 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import lombok.core.Agent;
+import lombok.core.AgentLauncher;
+
 import lombok.patcher.Hook;
 import lombok.patcher.MethodTarget;
 import lombok.patcher.ScriptManager;
 import lombok.patcher.StackRequest;
 import lombok.patcher.TargetMatcher;
-import lombok.patcher.equinox.EquinoxClassLoader;
 import lombok.patcher.scripts.ScriptBuilder;
 
 /**
@@ -44,13 +44,12 @@ import lombok.patcher.scripts.ScriptBuilder;
  * classes in this package for more information about which classes are transformed and how they are
  * transformed.
  */
-public class EclipsePatcher extends Agent {
+public class EclipsePatcher implements AgentLauncher.AgentLaunchable {
 	// At some point I'd like the agent to be capable of auto-detecting if its on eclipse or on ecj. This class is a sure sign we're not in ecj but in eclipse. -ReinierZ
 	@SuppressWarnings("unused")
 	private static final String ECLIPSE_SIGNATURE_CLASS = "org/eclipse/core/runtime/adaptor/EclipseStarter";
 	
-	@Override
-	public void runAgent(String agentArgs, Instrumentation instrumentation, boolean injected) throws Exception {
+	@Override public void runAgent(String agentArgs, Instrumentation instrumentation, boolean injected, Class<?> launchingContext) throws Exception {
 		String[] args = agentArgs == null ? new String[0] : agentArgs.split(":");
 		boolean forceEcj = false;
 		boolean forceEclipse = false;
@@ -69,15 +68,14 @@ public class EclipsePatcher extends Agent {
 		else if (forceEclipse) ecj = false;
 		else ecj = injected;
 		
-		registerPatchScripts(instrumentation, injected, ecj);
+		registerPatchScripts(instrumentation, injected, ecj, launchingContext);
 	}
 	
-	private static void registerPatchScripts(Instrumentation instrumentation, boolean reloadExistingClasses, boolean ecjOnly) {
+	private static void registerPatchScripts(Instrumentation instrumentation, boolean reloadExistingClasses, boolean ecjOnly, Class<?> launchingContext) {
 		ScriptManager sm = new ScriptManager();
 		sm.registerTransformer(instrumentation);
 		if (!ecjOnly) {
-			EquinoxClassLoader.addPrefix("lombok.");
-			EquinoxClassLoader.registerScripts(sm);
+			EclipseLoaderPatcher.patchEquinoxLoaders(sm, launchingContext);
 		}
 		
 		if (!ecjOnly) {
diff --git a/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java b/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java
index 8eec27fb..44adb333 100644
--- a/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java
+++ b/src/eclipseAgent/lombok/eclipse/agent/PatchExtensionMethod.java
@@ -224,7 +224,8 @@ public class PatchExtensionMethod {
 				if (methodCall.arguments != null) arguments.addAll(Arrays.asList(methodCall.arguments));
 				List<TypeBinding> argumentTypes = new ArrayList<TypeBinding>();
 				for (Expression argument : arguments) {
-					argumentTypes.add(argument.resolvedType);
+					if (argument.resolvedType != null) argumentTypes.add(argument.resolvedType);
+					// TODO: Instead of just skipping nulls entirely, there is probably a 'unresolved type' placeholder. THAT is what we ought to be adding here!
 				}
 				MethodBinding fixedBinding = scope.getMethod(extensionMethod.declaringClass, methodCall.selector, argumentTypes.toArray(new TypeBinding[0]), methodCall);
 				if (fixedBinding instanceof ProblemMethodBinding) {