jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: reload request for correct class in method inline visitor (#999)

Browse Source
This commit is contained in:
Skylot
2020-10-29 18:12:54 +00:00
parent 7353790ed1
commit aec8ebe237
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/dex/nodes/ClassNode.java
+1 -1
View File
@@ -586,7 +586,7 @@ public class ClassNode extends NotificationAttrNode implements ILoadable, ICodeN
public void reloadAtCodegenStage() {
ClassNode topCls = this.getTopParentClass();
if (topCls.getLoadStage() == LoadStage.CODEGEN_STAGE) {
throw new JadxRuntimeException("Class not yet loaded at codegen stage");
throw new JadxRuntimeException("Class not yet loaded at codegen stage: " + topCls);
}
topCls.add(AFlag.RELOAD_AT_CODEGEN_STAGE);
}
jadx-core/src/main/java/jadx/core/dex/visitors/InlineMethods.java
+2 -2
View File
@@ -57,7 +57,7 @@ public class InlineMethods extends AbstractVisitor {
MethodInlineAttr mia = MarkMethodsForInline.process(callMth);
if (mia == null) {
// method not yet loaded => will retry at codegen stage
mth.getParentClass().reloadAtCodegenStage();
callMth.getParentClass().reloadAtCodegenStage();
return;
}
if (mia.notNeeded()) {
@@ -65,7 +65,7 @@ public class InlineMethods extends AbstractVisitor {
}
inlineMethod(mth, callMth, mia, block, insn);
} catch (Exception e) {
throw new JadxRuntimeException("Failed to process method for inline", e);
throw new JadxRuntimeException("Failed to process method for inline: " + callMthInfo, e);
}
}