Pull out value replacement method in ReFrame

Author: Col-E

recaf-core/src/main/java/software/coley/recaf/util/analysis/ReEvaluator.java

@@ -227,7 +227,7 @@ public ReValue evaluate(@Nonnull ClassNode classNode,
 	private static class ExecutingFrame extends ReFrame implements Opcodes {
 		private AbstractInsnNode next;
 		private ReValue returnValue;
-		private boolean isStatic;
+		private final boolean isStatic;
 
 		public ExecutingFrame(@Nonnull MethodNode method) {
 			super(method.maxLocals, method.maxStack);

recaf-core/src/main/java/software/coley/recaf/util/analysis/ReFrame.java

@@ -1,5 +1,6 @@
 package software.coley.recaf.util.analysis;
 
+import jakarta.annotation.Nonnull;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.analysis.AnalyzerException;
@@ -14,11 +15,25 @@
  * @author Matt Coley
  */
 public class ReFrame extends Frame<ReValue> {
+	/**
+	 * New frame with the given number of expected locals/stack-slots.
+	 *
+	 * @param numLocals
+	 * 		Available local variable slots.
+	 * @param maxStack
+	 * 		Available stack slots.
+	 */
 	public ReFrame(int numLocals, int maxStack) {
 		super(numLocals, maxStack);
 	}
 
-	public ReFrame(Frame<? extends ReValue> frame) {
+	/**
+	 * New frame copying the state of the given frame.
+	 *
+	 * @param frame
+	 * 		Frame to copy stack/locals of.
+	 */
+	public ReFrame(@Nonnull Frame<? extends ReValue> frame) {
 		super(frame);
 	}
 
@@ -38,29 +53,40 @@ public void execute(AbstractInsnNode insn, Interpreter<ReValue> interpreter) thr
 				ReValue index = pop();
 				ReValue array = pop();
 				ReValue updatedArray = interpreter.ternaryOperation(insn, array, index, value);
-				if (updatedArray != array) {
-					for (int i = 0; i < getStackSize(); i++) {
-						ReValue stack = getStack(i);
-						if (stack == array) {
-							setStack(i, updatedArray);
-						} else if (stack instanceof ArrayValue stackArray) {
-							ArrayValue updatedStackArray = stackArray.updatedCopyIfContained(array, updatedArray);
-							setStack(i, updatedStackArray);
-						}
-					}
-					for (int i = 0; i < getLocals(); i++) {
-						ReValue local = getLocal(i);
-						if (local == array) {
-							setLocal(i, updatedArray);
-						} else if (local instanceof ArrayValue stackArray) {
-							ArrayValue updatedStackArray = stackArray.updatedCopyIfContained(array, updatedArray);
-							setLocal(i, updatedStackArray);
-						}
-					}
-				}
+				if (updatedArray != array)
+					replaceValue(array, updatedArray);
 				break;
 			default:
 				super.execute(insn, interpreter);
 		}
 	}
+
+	/**
+	 * Replace all references to the given value with the replacement.
+	 *
+	 * @param existing
+	 * 		Some existing value that exists in this frame.
+	 * @param replacement
+	 * 		Instance to replace the existing value with.
+	 */
+	public void replaceValue(@Nonnull ReValue existing, @Nonnull ReValue replacement) {
+		for (int i = 0; i < getStackSize(); i++) {
+			ReValue stack = getStack(i);
+			if (stack == existing) {
+				setStack(i, replacement);
+			} else if (stack instanceof ArrayValue stackArray) {
+				ArrayValue updatedStackArray = stackArray.updatedCopyIfContained(existing, replacement);
+				setStack(i, updatedStackArray);
+			}
+		}
+		for (int i = 0; i < getLocals(); i++) {
+			ReValue local = getLocal(i);
+			if (local == existing) {
+				setLocal(i, replacement);
+			} else if (local instanceof ArrayValue stackArray) {
+				ArrayValue updatedStackArray = stackArray.updatedCopyIfContained(existing, replacement);
+				setLocal(i, updatedStackArray);
+			}
+		}
+	}
 }