fix: attach method details before OverrideMethodVisitor

skylot · May 12, 2020 · d59c99d · d59c99d
1 parent 85760cc
commit d59c99d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/Jadx.java b/jadx-core/src/main/java/jadx/core/Jadx.java
@@ -57,6 +57,7 @@ public static List<IDexTreeVisitor> getPassesList(JadxArgs args) {
 			passes.add(new BlockExceptionHandler());
 			passes.add(new BlockFinish());
 
+			passes.add(new AttachMethodDetails());
 			passes.add(new OverrideMethodVisitor());
 
 			passes.add(new SSATransform());
@@ -65,7 +66,6 @@ public static List<IDexTreeVisitor> getPassesList(JadxArgs args) {
 			passes.add(new InitCodeVariables());
 			passes.add(new MarkFinallyVisitor());
 			passes.add(new ConstInlineVisitor());
-			passes.add(new AttachMethodDetails());
 			passes.add(new TypeInferenceVisitor());
 			if (args.isDebugInfo()) {
 				passes.add(new DebugInfoApplyVisitor());

diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/AttachMethodDetails.java b/jadx-core/src/main/java/jadx/core/dex/visitors/AttachMethodDetails.java
@@ -8,13 +8,17 @@
 import jadx.core.dex.nodes.RootNode;
 import jadx.core.dex.nodes.utils.MethodUtils;
 import jadx.core.dex.visitors.shrink.CodeShrinkVisitor;
+import jadx.core.dex.visitors.typeinference.TypeInferenceVisitor;
 import jadx.core.utils.exceptions.JadxException;
 
 @JadxVisitor(
 		name = "Attach Method Details",
 		desc = "Attach method details for invoke instructions",
 		runBefore = {
-				CodeShrinkVisitor.class
+				CodeShrinkVisitor.class,
+				TypeInferenceVisitor.class,
+				MethodInvokeVisitor.class,
+				OverrideMethodVisitor.class
 		}
 )
 public class AttachMethodDetails extends AbstractVisitor {