From 85b38bec19019a2a684705e3c3306dd1d27df489 Mon Sep 17 00:00:00 2001
From: Linda Guiga <lindaguiga3@gmail.com>
Date: Wed, 1 Nov 2023 11:08:57 -0400
Subject: [PATCH] Fix merging of jumpdest and keccak_general.

---
 evm/src/cpu/columns/ops.rs | 2 +-
 evm/src/cpu/contextops.rs  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/evm/src/cpu/columns/ops.rs b/evm/src/cpu/columns/ops.rs
index 2ec3661a..282fa393 100644
--- a/evm/src/cpu/columns/ops.rs
+++ b/evm/src/cpu/columns/ops.rs
@@ -23,7 +23,7 @@ pub struct OpsColumnsView<T: Copy> {
     /// Combines SHL and SHR flags.
     pub shift: T,
     /// Combines JUMPDEST and KECCAK_GENERAL flags.
-    pub jumpdest_keccak_general: T, // Combines JUMPDEST and KECCAK_GENERAL flags.
+    pub jumpdest_keccak_general: T,
     /// Flag for PROVER_INPUT.
     pub prover_input: T,
     /// Combines JUMP and JUMPI flags.
diff --git a/evm/src/cpu/contextops.rs b/evm/src/cpu/contextops.rs
index c64f718b..8e25d5a1 100644
--- a/evm/src/cpu/contextops.rs
+++ b/evm/src/cpu/contextops.rs
@@ -23,11 +23,10 @@ const KEEPS_CONTEXT: OpsColumnsView<bool> = OpsColumnsView {
     logic_op: true,
     not_pop: true,
     shift: true,
-    keccak_general: true,
+    jumpdest_keccak_general: true,
     prover_input: true,
     jumps: true,
     pc_push0: true,
-    jumpdest: true,
     push: true,
     dup_swap: true,
     context_op: false,