added cast instructions (#192)

Co-authored-by: nbauma109 <nbauma109@github.com>
nbauma109 · Mar 17, 2023 · 4d82eb8 · 4d82eb8
1 parent c00ffd2
commit 4d82eb8
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 531 deletions.
diff --git a/src/main/java/jd/core/model/classfile/ClassFile.java b/src/main/java/jd/core/model/classfile/ClassFile.java
@@ -61,6 +61,7 @@ public class ClassFile extends Base
     private final String internalPackageName;
 
     private ClassFile outerClass;
+    private ClassFile superClassFile;
     private Field outerThisField;
     private List<ClassFile> innerClassFiles;
 
@@ -382,7 +383,7 @@ public Method getMethod(int methodNameIndex, int methodDescriptorIndex)
                 return method;
             }
         }
-        return null;
+        return superClassFile == null ? null : superClassFile.getMethod(methodNameIndex, methodDescriptorIndex);
     }
 
     public Method getMethod(String methodName, String methodDescriptor)
@@ -402,7 +403,7 @@ public Method getMethod(String methodName, String methodDescriptor)
                 }
             }
         }
-        return null;
+        return superClassFile == null ? null : superClassFile.getMethod(methodName, methodDescriptor);
     }
 
     public List<Instruction> getEnumValues()
@@ -444,6 +445,14 @@ public VariableNameGenerator getVariableNameGenerator() {
         return variableNameGenerator;
     }
 
+    public ClassFile getSuperClassFile() {
+        return superClassFile;
+    }
+
+    public void setSuperClassFile(ClassFile superClassFile) {
+        this.superClassFile = superClassFile;
+    }
+
     @Override
     public String toString() {
         return internalClassName;

diff --git a/src/main/java/jd/core/model/instruction/bytecode/instruction/AConstNull.java b/src/main/java/jd/core/model/instruction/bytecode/instruction/AConstNull.java
@@ -16,20 +16,29 @@
  ******************************************************************************/
 package jd.core.model.instruction.bytecode.instruction;
 
+import java.util.function.BiFunction;
+
 import jd.core.model.classfile.ClassFile;
 import jd.core.model.classfile.LocalVariables;
 
 public class AConstNull extends Instruction
 {
+    private BiFunction<ClassFile, LocalVariables, String> signatureFunction;
+
     public AConstNull(int opcode, int offset, int lineNumber)
     {
         super(opcode, offset, lineNumber);
     }
 
+    public void setSignatureFunction(BiFunction<ClassFile, LocalVariables, String> signatureFunction)
+    {
+        this.signatureFunction = signatureFunction;
+    }
+
     @Override
     public String getReturnedSignature(
             ClassFile classFile, LocalVariables localVariables)
     {
-        return null;
+        return signatureFunction == null ? null : signatureFunction.apply(classFile, localVariables);
     }
 }
diff --git a/src/main/java/jd/core/model/instruction/bytecode/instruction/InvokeInstruction.java b/src/main/java/jd/core/model/instruction/bytecode/instruction/InvokeInstruction.java
@@ -19,7 +19,6 @@
 import org.apache.bcel.classfile.ConstantCP;
 import org.apache.bcel.classfile.ConstantNameAndType;
 import org.apache.bcel.classfile.Signature;
-import org.jd.core.v1.util.StringConstants;
 
 import java.util.List;
 
@@ -60,8 +59,7 @@ public String getReturnedSignature(
         String methodDescriptor = constants.getConstantUtf8(cnat.getSignatureIndex());
 
         String methodReturnedSignature = SignatureUtil.getMethodReturnedSignature(methodDescriptor);
-        if (methodReturnedSignature.endsWith(StringConstants.INTERNAL_OBJECT_SIGNATURE)
-                && internalClassName.charAt(0) != '['
+        if (internalClassName.charAt(0) != '['
                 && classFile.getLoader().canLoad(internalClassName)) {
             ClassFile javaClass = ClassFileDeserializer.deserialize(classFile.getLoader(), internalClassName);
             Method method = javaClass.getMethod(methodName, methodDescriptor);

diff --git a/src/main/java/jd/core/process/analyzer/classfile/LocalVariableAnalyzer.java b/src/main/java/jd/core/process/analyzer/classfile/LocalVariableAnalyzer.java
@@ -30,6 +30,7 @@
 import jd.core.model.classfile.LocalVariables;
 import jd.core.model.classfile.Method;
 import jd.core.model.instruction.bytecode.ByteCodeConstants;
+import jd.core.model.instruction.bytecode.instruction.AConstNull;
 import jd.core.model.instruction.bytecode.instruction.ALoad;
 import jd.core.model.instruction.bytecode.instruction.AStore;
 import jd.core.model.instruction.bytecode.instruction.ArrayLoadInstruction;
@@ -52,7 +53,6 @@
 import jd.core.model.instruction.bytecode.instruction.ReturnInstruction;
 import jd.core.model.instruction.bytecode.instruction.StoreInstruction;
 import jd.core.model.instruction.bytecode.instruction.TernaryOpStore;
-import jd.core.process.analyzer.classfile.visitor.AddCheckCastVisitor;
 import jd.core.process.analyzer.classfile.visitor.SearchInstructionByOffsetVisitor;
 import jd.core.process.analyzer.instruction.bytecode.util.ByteCodeUtil;
 import jd.core.process.analyzer.util.InstructionUtil;
@@ -208,7 +208,7 @@ public static void analyze(
             String returnedSignature = getReturnedSignature(classFile, method);
 
             analyzeMethodCode(
-                    classFile, localVariables, list, listForAnalyze,
+                    classFile, localVariables, listForAnalyze,
                     returnedSignature);
 
             // Upgrade byte type to char type
@@ -687,8 +687,7 @@ private static void checkLocalVariableRangesForIndexInstruction(
      */
     private static void analyzeMethodCode(
             ClassFile classFile,
-            LocalVariables localVariables, List<Instruction> list,
-            List<Instruction> listForAnalyze, String returnedSignature)
+            LocalVariables localVariables, List<Instruction> listForAnalyze, String returnedSignature)
     {
         ConstantPool constants = classFile.getConstantPool();
 
@@ -711,6 +710,16 @@ private static void analyzeMethodCode(
                         ((IndexInstruction)instruction).getIndex(), i,
                         returnedSignature);
             }
+
+            if (instruction.getOpcode() == ByteCodeConstants.TERNARYOPSTORE && i<length-1) {
+                TernaryOpStore ternaryOpStore = (TernaryOpStore) instruction;
+                int ternaryOp2ndValueOffset = ternaryOpStore.getTernaryOp2ndValueOffset();
+                Instruction ternaryOp2ndValue = SearchInstructionByOffsetVisitor.visit(listForAnalyze.get(i+1), ternaryOp2ndValueOffset);
+                if (ternaryOp2ndValue instanceof AConstNull) {
+                    AConstNull aConstNull = (AConstNull) ternaryOp2ndValue;
+                    aConstNull.setSignatureFunction(ternaryOpStore::getReturnedSignature);
+                }
+            }
         }
 
         // Analyse inverse
@@ -796,16 +805,6 @@ private static void analyzeMethodCode(
                 break;
             }
         }
-
-        LocalVariable lv;
-        // Ajout d'instructions "cast"
-        for (int i=0; i<length; i++)
-        {
-            lv = localVariables.getLocalVariableAt(i);
-            if (lv.getSignatureIndex() == internalObjectSignatureIndex) {
-                addCastInstruction(constants, list, localVariables, lv);
-            }
-        }
     }
 
     /** Analyse du type de la variable locale No varIndex. */
@@ -1832,16 +1831,4 @@ private static boolean reverseAnalyzePutStaticPutField(
 
         return false;
     }
-
-    private static void addCastInstruction(
-            ConstantPool constants, List<Instruction> list,
-            LocalVariables localVariables, LocalVariable lv)
-    {
-        // Add cast instruction before all 'ALoad' instruction for local
-        // variable le used type is not 'Object'.
-        AddCheckCastVisitor visitor = new AddCheckCastVisitor(
-                constants, localVariables, lv);
-
-        list.forEach(visitor::visit);
-    }
 }