diff --git a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java index 8bcbee0df..48b2c5791 100644 --- a/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java +++ b/jadx-core/src/main/java/jadx/core/dex/visitors/regions/TernaryMod.java @@ -122,6 +122,7 @@ public class TernaryMod extends AbstractRegionVisitor implements IRegionIterativ int branchLine = Math.max(thenInsn.getSourceLine(), elseInsn.getSourceLine()); ternInsn.setSourceLine(Math.max(ifRegion.getSourceLine(), branchLine)); + thenInsn.setResult(null); // unset without unbind, SSA var still in use InsnRemover.unbindResult(mth, elseInsn); // remove 'if' instruction diff --git a/jadx-core/src/main/java/jadx/core/utils/DebugChecks.java b/jadx-core/src/main/java/jadx/core/utils/DebugChecks.java index 05fb79950..42dc1b848 100644 --- a/jadx-core/src/main/java/jadx/core/utils/DebugChecks.java +++ b/jadx-core/src/main/java/jadx/core/utils/DebugChecks.java @@ -52,7 +52,7 @@ public class DebugChecks { try { checkMethod(mth); } catch (Exception e) { - throw new JadxRuntimeException("Debug check failed after visitor: " + visitor, e); + mth.addError("Debug check failed after visitor: " + visitor, e); } }