ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[java decompiler] improves anonymous classes verification

Browse Source 
- puts the check under an option
- uses 'EnclosingMethod' attribute to skip unrelated methods
This commit is contained in:
Roman Shevchenko
2018-09-28 18:17:53 +02:00
parent 866661df29
commit 89977a8438
3 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
View File

@@ -18,6 +18,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.vars.VarVersionPair;
import org.jetbrains.java.decompiler.struct.StructClass; import org.jetbrains.java.decompiler.struct.StructClass;
import org.jetbrains.java.decompiler.struct.StructContext; import org.jetbrains.java.decompiler.struct.StructContext;
import org.jetbrains.java.decompiler.struct.StructMethod; import org.jetbrains.java.decompiler.struct.StructMethod;
import org.jetbrains.java.decompiler.struct.attr.StructEnclosingMethodAttribute;
import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute; import org.jetbrains.java.decompiler.struct.attr.StructGeneralAttribute;
import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute; import org.jetbrains.java.decompiler.struct.attr.StructInnerClassesAttribute;
import org.jetbrains.java.decompiler.struct.consts.ConstantPool; import org.jetbrains.java.decompiler.struct.consts.ConstantPool;
@@ -56,6 +57,7 @@ public class ClassesProcessor implements CodeConstants {
Map<String, String> mapNewSimpleNames = new HashMap<>(); Map<String, String> mapNewSimpleNames = new HashMap<>();
boolean bDecompileInner = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_INNER); boolean bDecompileInner = DecompilerContext.getOption(IFernflowerPreferences.DECOMPILE_INNER);
boolean verifyAnonymousClasses = DecompilerContext.getOption(IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES);
// create class nodes // create class nodes
for (StructClass cl : context.getClasses().values()) { for (StructClass cl : context.getClasses().values()) {
@@ -171,27 +173,22 @@ public class ClassesProcessor implements CodeConstants {
nestedNode.type = rec.type; nestedNode.type = rec.type;
nestedNode.access = rec.accessFlags; nestedNode.access = rec.accessFlags;
// sanity checks of the class supposed to be anonymous
if (verifyAnonymousClasses && nestedNode.type == ClassNode.CLASS_ANONYMOUS && !isAnonymous(nestedNode.classStruct, scl)) {
nestedNode.type = ClassNode.CLASS_LOCAL;
}
if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) { if (nestedNode.type == ClassNode.CLASS_ANONYMOUS) {
StructClass cl = nestedNode.classStruct; StructClass cl = nestedNode.classStruct;
// remove static if anonymous class (a common compiler bug)
nestedNode.access &= ~CodeConstants.ACC_STATIC;
int[] interfaces = cl.getInterfaces(); int[] interfaces = cl.getInterfaces();
if (interfaces.length > 0) {
// sanity checks of the class supposed to be anonymous nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
boolean isAnonymousChecked = checkClassAnonymous(cl, scl); }
else {
if(isAnonymousChecked) { nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
// remove static if anonymous class (a common compiler bug)
nestedNode.access &= ~CodeConstants.ACC_STATIC;
if (interfaces.length > 0) {
nestedNode.anonymousClassType = new VarType(cl.getInterface(0), true);
}
else {
nestedNode.anonymousClassType = new VarType(cl.superClass.getString(), true);
}
} else { // change it to a local class
nestedNode.type = ClassNode.CLASS_LOCAL;
nestedNode.access &= (CodeConstants.ACC_ABSTRACT | CodeConstants.ACC_FINAL);
} }
} }
else if (nestedNode.type == ClassNode.CLASS_LOCAL) { else if (nestedNode.type == ClassNode.CLASS_LOCAL) {
@@ -213,20 +210,19 @@ public class ClassesProcessor implements CodeConstants {
} }
} }
private boolean checkClassAnonymous(StructClass cl, StructClass enclosing_cl) { private static boolean isAnonymous(StructClass cl, StructClass enclosingCl) {
int[] interfaces = cl.getInterfaces();
boolean hasNonTrivialSuperClass = cl.superClass != null && !VarType.VARTYPE_OBJECT.equals(new VarType(cl.superClass.getString(), true));
// checking super class and interfaces // checking super class and interfaces
if(interfaces.length > 0) { int[] interfaces = cl.getInterfaces();
if(hasNonTrivialSuperClass || interfaces.length > 1) { // can't have multiple 'sources' if (interfaces.length > 0) {
String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName+"'. Multiple interfaces and/or super class defined."; boolean hasNonTrivialSuperClass = cl.superClass != null && !VarType.VARTYPE_OBJECT.equals(new VarType(cl.superClass.getString(), true));
if (hasNonTrivialSuperClass || interfaces.length > 1) { // can't have multiple 'sources'
String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName + "'. Multiple interfaces and/or super class defined.";
DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN); DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
return false; return false;
} }
} else if(cl.superClass == null) { // neither interface nor super class defined }
String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName+"'. Neither interface nor super class defined."; else if (cl.superClass == null) { // neither interface nor super class defined
String message = "Inconsistent anonymous class definition: '" + cl.qualifiedName + "'. Neither interface nor super class defined.";
DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN); DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
return false; return false;
} }
@@ -234,58 +230,64 @@ public class ClassesProcessor implements CodeConstants {
// FIXME: check constructors // FIXME: check constructors
// FIXME: check enclosing class/method // FIXME: check enclosing class/method
ConstantPool pool = enclosing_cl.getPool(); ConstantPool pool = enclosingCl.getPool();
int ref_counter = 0; int refCounter = 0;
boolean ref_not_new = false; boolean refNotNew = false;
StructEnclosingMethodAttribute attribute = cl.getAttribute(StructGeneralAttribute.ATTRIBUTE_ENCLOSING_METHOD);
String enclosingMethod = attribute != null ? attribute.getMethodName() : null;
// checking references in the enclosing class
for (StructMethod mt : enclosingCl.getMethods()) {
if (enclosingMethod != null && !enclosingMethod.equals(mt.getName())) {
continue;
}
// checking references in the enclosing class (TODO: limit to the enclosing method?)
for (StructMethod mt : enclosing_cl.getMethods()) {
try { try {
mt.expandData(); mt.expandData();
InstructionSequence seq = mt.getInstructionSequence(); InstructionSequence seq = mt.getInstructionSequence();
if (seq != null) {
if(seq != null) {
int len = seq.length(); int len = seq.length();
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
Instruction instr = seq.getInstr(i); Instruction instr = seq.getInstr(i);
switch (instr.opcode) {
switch(instr.opcode) { case opc_checkcast:
case opc_checkcast: case opc_instanceof:
case opc_instanceof: if (cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) { refCounter++;
ref_counter++; refNotNew = true;
ref_not_new = true; }
} break;
break; case opc_new:
case opc_new: case opc_anewarray:
case opc_anewarray: case opc_multianewarray:
case opc_multianewarray: if (cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) {
if(cl.qualifiedName.equals(pool.getPrimitiveConstant(instr.operand(0)).getString())) { refCounter++;
ref_counter++; }
} break;
break; case opc_getstatic:
case opc_getstatic: case opc_putstatic:
case opc_putstatic: if (cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) {
if(cl.qualifiedName.equals(pool.getLinkConstant(instr.operand(0)).classname)) { refCounter++;
ref_counter++; refNotNew = true;
ref_not_new = true; }
}
} }
} }
} }
mt.releaseResources(); mt.releaseResources();
} catch(IOException ex) { }
String message = "Could not read method while checking anonymous class definition: '"+enclosing_cl.qualifiedName+"', '"+ catch (IOException ex) {
InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor())+"'"; String message = "Could not read method while checking anonymous class definition: '" + enclosingCl.qualifiedName + "', '" +
InterpreterUtil.makeUniqueKey(mt.getName(), mt.getDescriptor()) + "'";
DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN); DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
return false; return false;
} }
if(ref_counter > 1 || ref_not_new) { if (refCounter > 1 || refNotNew) {
String message = "Inconsistent references to the class '"+cl.qualifiedName+"' which is supposed to be anonymous"; String message = "Inconsistent references to the class '" + cl.qualifiedName + "' which is supposed to be anonymous";
DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN); DecompilerContext.getLogger().writeMessage(message, IFernflowerLogger.Severity.WARN);
return false; return false;
} }

2
src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java vendored
View File

@@ -33,6 +33,7 @@ public interface IFernflowerPreferences {
String LAMBDA_TO_ANONYMOUS_CLASS = "lac"; String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
String BYTECODE_SOURCE_MAPPING = "bsm"; String BYTECODE_SOURCE_MAPPING = "bsm";
String IGNORE_INVALID_BYTECODE = "iib"; String IGNORE_INVALID_BYTECODE = "iib";
String VERIFY_ANONYMOUS_CLASSES = "vac";
String LOG_LEVEL = "log"; String LOG_LEVEL = "log";
String MAX_PROCESSING_METHOD = "mpm"; String MAX_PROCESSING_METHOD = "mpm";
@@ -78,6 +79,7 @@ public interface IFernflowerPreferences {
defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0"); defaults.put(LAMBDA_TO_ANONYMOUS_CLASS, "0");
defaults.put(BYTECODE_SOURCE_MAPPING, "0"); defaults.put(BYTECODE_SOURCE_MAPPING, "0");
defaults.put(IGNORE_INVALID_BYTECODE, "0"); defaults.put(IGNORE_INVALID_BYTECODE, "0");
defaults.put(VERIFY_ANONYMOUS_CLASSES, "0");
defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name()); defaults.put(LOG_LEVEL, IFernflowerLogger.Severity.INFO.name());
defaults.put(MAX_PROCESSING_METHOD, "0"); defaults.put(MAX_PROCESSING_METHOD, "0");

3
test/org/jetbrains/java/decompiler/SingleClassesTest.java
View File

@@ -24,7 +24,8 @@ public class SingleClassesTest {
fixture = new DecompilerTestFixture(); fixture = new DecompilerTestFixture();
fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1", fixture.setUp(IFernflowerPreferences.BYTECODE_SOURCE_MAPPING, "1",
IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1", IFernflowerPreferences.DUMP_ORIGINAL_LINES, "1",
IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1"); IFernflowerPreferences.IGNORE_INVALID_BYTECODE, "1",
IFernflowerPreferences.VERIFY_ANONYMOUS_CLASSES, "1");
} }
@After @After