BlocksMod/SpecialSource
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement class reflection remapping for Class.forName("")

Browse Source 
Remaps constant literals passed to Class.forName(""), similar to
the existing class.getDeclaredField("") remapping in RemapperPreprocessor.
Both reflection remappings use the jarMapping, if one is passed in.
Adds new APIs to enable/disable the respective reflection remaps.
This commit is contained in:
Agaricus 2013-05-10 19:46:55 -07:00
parent f943b5a6c5
commit 0cf7f47ce7
1 changed files with 80 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/main/java/net/md_5/specialsource/RemapperPreprocessor.java
View File

@ -43,7 +43,11 @@ import java.util.List;
* "Pre-process" a class file, intended to be used before remapping with
* JarRemapper.
*
* Currently includes: - Extracting inheritance
* Currently includes:
* - Extracting inheritance
* - Applying access transformers
* - Remapping reflected field string constants
* - Remapping reflected class name string constants
*/
public class RemapperPreprocessor {
@ -51,6 +55,8 @@ public class RemapperPreprocessor {
private InheritanceMap inheritanceMap;
private JarMapping jarMapping;
private AccessMap accessMap;
private boolean remapReflectField;
private boolean remapReflectClass;
/**
*
@ -58,12 +64,15 @@ public class RemapperPreprocessor {
* or null to not extract inheritance
* @param jarMapping Mapping for reflection remapping, or null to not remap
* reflection
* @param accessMap Access transformer mappings, or null to not apply AT
* @throws IOException
*/
public RemapperPreprocessor(InheritanceMap inheritanceMap, JarMapping jarMapping, AccessMap accessMap) {
this.inheritanceMap = inheritanceMap;
this.jarMapping = jarMapping;
this.accessMap = accessMap;
this.remapReflectField = true;
this.remapReflectClass = false;
}
public RemapperPreprocessor(InheritanceMap inheritanceMap, JarMapping jarMapping) {
@ -78,6 +87,22 @@ public class RemapperPreprocessor {
return preprocess(new ClassReader(bytecode));
}
/**
* Enable or disable remapping reflection field string constants.
* Requires a jarMapping, enabled by default if present.
*/
public void setRemapReflectField(boolean b) {
remapReflectField = b;
}
/**
* Enable or disable remapping reflection class name string constants.
* Requires a jarMapping.
*/
public void setRemapReflectClass(boolean b) {
remapReflectClass = b;
}
@SuppressWarnings("unchecked")
public byte[] preprocess(ClassReader classReader) {
byte[] bytecode = null;
@ -134,8 +159,15 @@ public class RemapperPreprocessor {
if (jarMapping != null) {
AbstractInsnNode insn = methodNode.instructions.getFirst();
while (insn != null) {
if (insn.getOpcode() == Opcodes.INVOKEVIRTUAL) {
switch (insn.getOpcode())
{
case Opcodes.INVOKEVIRTUAL:
remapGetDeclaredField(insn);
break;
case Opcodes.INVOKESTATIC:
remapClassForName(insn);
break;
}
insn = insn.getNext();
@ -161,6 +193,10 @@ public class RemapperPreprocessor {
* @param insn Method call instruction
*/
private void remapGetDeclaredField(AbstractInsnNode insn) {
if (!this.remapReflectField) {
return;
}
MethodInsnNode mi = (MethodInsnNode) insn;
if (!mi.owner.equals("java/lang/Class") || !mi.name.equals("getDeclaredField") || !mi.desc.equals("(Ljava/lang/String;)Ljava/lang/reflect/Field;")) {
@ -170,7 +206,7 @@ public class RemapperPreprocessor {
logR("ReflectionRemapper found getDeclaredField!");
if (insn.getPrevious() == null || insn.getPrevious().getOpcode() != Opcodes.LDC) {
logR("- not constant field; skipping");
logR("- not constant field; skipping, prev=" + insn.getPrevious());
return;
}
LdcInsnNode ldcField = (LdcInsnNode) insn.getPrevious();
@ -201,6 +237,46 @@ public class RemapperPreprocessor {
}
}
/**
* Replace Class.forName("string") with a remapped field string
*
* @param insn Method call instruction
*/
private void remapClassForName(AbstractInsnNode insn) {
if (!this.remapReflectClass) {
return;
}
MethodInsnNode mi = (MethodInsnNode) insn;
if (!mi.owner.equals("java/lang/Class") || !mi.name.equals("forName") || !mi.desc.equals("(Ljava/lang/String;)Ljava/lang/Class;")) {
return;
}
logR("ReflectionRemapped found Class forName!");
// TODO: refactor with remapGetDeclaredField()
if (insn.getPrevious() == null || insn.getPrevious().getOpcode() != Opcodes.LDC) {
logR("- not constant field; skipping, prev=" + insn.getPrevious());
return;
}
LdcInsnNode ldcClassName = (LdcInsnNode) insn.getPrevious();
if (!(ldcClassName.cst instanceof String)) {
logR("- not field string; skipping: " + ldcClassName.cst);
return;
}
String className = (String) ldcClassName.cst;
String newName = jarMapping.classes.get(className.replace('.', '/')); // TODO: ToInternalName
logR("Remapping " + className + " -> " + newName);
if (newName != null) {
// Change the string literal to the correct name
ldcClassName.cst = newName.replace('/', '.');
}
}
private void logI(String message) {
if (debug) {
System.out.println("[Inheritance] " + message);