🐛 Fix compare proto

yhs0602 · May 19, 2024 · 7235fbf · 7235fbf
1 parent 3cd1df3
commit 7235fbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/kotlin/dex/ProtoId.kt b/src/main/kotlin/dex/ProtoId.kt
@@ -14,14 +14,15 @@ data class ProtoId(
 
         if (shorty != other.shorty) return false
         if (returnType != other.returnType) return false
+        if (parameters != other.parameters) return false
 
         return true
     }
 
     override fun hashCode(): Int {
         var result = shorty.hashCode()
         result = 31 * result + returnType.hashCode()
+        result = 31 * result + parameters.hashCode()
         return result
     }
-
 }
diff --git a/src/main/kotlin/vm/Environment.kt b/src/main/kotlin/vm/Environment.kt
@@ -272,7 +272,7 @@ class Environment(
             val triple = Triple(methodId.classId, methodId.protoId.parameters, methodId.name)
             val mocked = mockedMethods[triple]
             if (mocked != null) {
-                println("Requested: $methodId, found: $mocked, triple: $triple")
+                println("Requested: $methodId, found mocked: $mocked, triple: $triple")
                 // check if the codeitem is not null, handle inheritance
                 // It should find the finest method
                 if (direct) {
@@ -340,7 +340,7 @@ class Environment(
 //            " $classDef,  $methodId:")
 //            " ${classData.directMethods.joinToString { it.methodId.toString() }}" +
 //            " ${classData.virtualMethods.joinToString { it.methodId.toString() }}")
-        println("Requested: $methodId, found: $method")
+        println("Requested: $methodId, found encoded: $method; ${method?.methodId}")
         println(classData.directMethods.joinToString { it.methodId.toString() })
         println(classData.virtualMethods.joinToString { it.methodId.toString() })
         if (method == null) {