From a7f0e61c7483ecd0688d606b693dffea046d95aa Mon Sep 17 00:00:00 2001 From: Graham Date: Thu, 12 Mar 2020 21:08:28 +0000 Subject: [PATCH] Revert "Relax operand equality condition in try/finally detection" This reverts commit 7e2421df8951151d009d1eb88590bfd7e456042d. --- .../decompiler/modules/decompiler/FinallyProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java index 83e8bb9..cd6e1d7 100644 --- a/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java +++ b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java @@ -843,11 +843,11 @@ public class FinallyProcessor { if (firstOp != secondOp) { // a-load/store instructions if (first.opcode == CodeConstants.opc_aload || first.opcode == CodeConstants.opc_astore) { - //for (int[] arr : lstStoreVars) { - // if (arr[0] == firstOp && arr[1] == secondOp) { + for (int[] arr : lstStoreVars) { + if (arr[0] == firstOp && arr[1] == secondOp) { return true; - // } - //} + } + } } return false;