Fix targets of static calls

adamsmd · adamsmd · commit d724c94592ec · 2021-01-15T04:03:40.000-05:00
diff --git a/decompiler/src/main/scala/org/ucombinator/jade/decompile/DecompileInsn.scala b/decompiler/src/main/scala/org/ucombinator/jade/decompile/DecompileInsn.scala
@@ -102,8 +102,7 @@ object DecompileInsn extends Log {
     }
     def staticCall(node: AbstractInsnNode): DecompiledInsn = {
       val (insn, argumentTypes, typeArguments) = call(node)
-      val scope = new FieldAccessExpr(Descriptor.classNameExpr(insn.owner), /*TODO*/ new NodeList(), new SimpleName(insn.name))
-      DecompiledExpression(new MethodCallExpr(scope, typeArguments, insn.name, new NodeList(argumentTypes.indices.map(args): _*)))
+      DecompiledExpression(new MethodCallExpr(Descriptor.classNameExpr(insn.owner), typeArguments, insn.name, new NodeList(argumentTypes.indices.map(args): _*)))
     }
     (
       retVar,

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,7 @@ object DecompileInsn extends Log {`
`102`	`102`	`}`
`103`	`103`	`def staticCall(node: AbstractInsnNode): DecompiledInsn = {`
`104`	`104`	`val (insn, argumentTypes, typeArguments) = call(node)`
`105`		`- val scope = new FieldAccessExpr(Descriptor.classNameExpr(insn.owner), /TODO/ new NodeList(), new SimpleName(insn.name))`
`106`		`- DecompiledExpression(new MethodCallExpr(scope, typeArguments, insn.name, new NodeList(argumentTypes.indices.map(args): _*)))`
	`105`	`+ DecompiledExpression(new MethodCallExpr(Descriptor.classNameExpr(insn.owner), typeArguments, insn.name, new NodeList(argumentTypes.indices.map(args): _*)))`
`107`	`106`	`}`
`108`	`107`	`(`
`109`	`108`	`retVar,`