Keep block info in instruction argument

Author: chfast

lib/evmone/analysis.cpp

@@ -66,14 +66,13 @@ code_analysis analyze(
 
         if (!block || jumpdest)
         {
-            // Create new block.
-            block = &analysis.blocks.emplace_back();
-            block_stack_change = 0;
-
             // Create BEGINBLOCK instruction which either replaces JUMPDEST or is injected
             // in case there is no JUMPDEST.
             auto& beginblock_instr = analysis.instrs.emplace_back(fns[OPX_BEGINBLOCK]);
-            beginblock_instr.arg.p.number = static_cast<int>(analysis.blocks.size() - 1);
+
+            // Start new block.
+            block = &beginblock_instr.arg.block;
+            block_stack_change = 0;
 
             if (jumpdest)  // Add the jumpdest to the map.
             {

lib/evmone/analysis.hpp

@@ -189,7 +189,6 @@ static_assert(sizeof(block_info) == 8);
 struct code_analysis
 {
     std::vector<instr_info> instrs;
-    std::vector<block_info> blocks;
 
     /// Storage for large push values.
     std::vector<intx::uint256> push_values;

lib/evmone/instructions.cpp

@@ -1200,7 +1200,7 @@ const instr_info* op_selfdestruct(const instr_info*, execution_state& state) noe
 
 const instr_info* opx_beginblock(const instr_info* instr, execution_state& state) noexcept
 {
-    auto& block = state.analysis->blocks[static_cast<size_t>(instr->arg.p.number)];
+    auto& block = instr->arg.block;
 
     if ((state.gas_left -= block.gas_cost) < 0)
         return state.exit(EVMC_OUT_OF_GAS);

test/unittests/analysis_test.cpp

@@ -30,7 +30,6 @@ TEST(analysis, example1)
     ASSERT_EQ(analysis.instrs.size(), 8);
 
     EXPECT_EQ(analysis.instrs[0].fn, fake_fn_table[OPX_BEGINBLOCK]);
-    EXPECT_EQ(analysis.instrs[0].arg.p.number, 0);
     EXPECT_EQ(analysis.instrs[1].fn, fake_fn_table[OP_PUSH1]);
     EXPECT_EQ(analysis.instrs[2].fn, fake_fn_table[OP_PUSH1]);
     EXPECT_EQ(analysis.instrs[3].fn, fake_fn_table[OP_MSTORE8]);
@@ -39,10 +38,9 @@ TEST(analysis, example1)
     EXPECT_EQ(analysis.instrs[6].fn, fake_fn_table[OP_SSTORE]);
     EXPECT_EQ(analysis.instrs[7].fn, fake_fn_table[OP_STOP]);
 
-    ASSERT_EQ(analysis.blocks.size(), 1);
-    EXPECT_EQ(analysis.blocks[0].gas_cost, 14);
-    EXPECT_EQ(analysis.blocks[0].stack_req, 0);
-    EXPECT_EQ(analysis.blocks[0].stack_max_growth, 2);
+    EXPECT_EQ(analysis.instrs[0].arg.block.gas_cost, 14);
+    EXPECT_EQ(analysis.instrs[0].arg.block.stack_req, 0);
+    EXPECT_EQ(analysis.instrs[0].arg.block.stack_max_growth, 2);
 }
 
 TEST(analysis, stack_up_and_down)
@@ -52,16 +50,14 @@ TEST(analysis, stack_up_and_down)
 
     ASSERT_EQ(analysis.instrs.size(), 20);
     EXPECT_EQ(analysis.instrs[0].fn, fake_fn_table[OPX_BEGINBLOCK]);
-    EXPECT_EQ(analysis.instrs[0].arg.p.number, 0);
     EXPECT_EQ(analysis.instrs[1].fn, fake_fn_table[OP_DUP2]);
     EXPECT_EQ(analysis.instrs[2].fn, fake_fn_table[OP_DUP1]);
     EXPECT_EQ(analysis.instrs[8].fn, fake_fn_table[OP_POP]);
     EXPECT_EQ(analysis.instrs[18].fn, fake_fn_table[OP_PUSH1]);
 
-    ASSERT_EQ(analysis.blocks.size(), 1);
-    EXPECT_EQ(analysis.blocks[0].gas_cost, 7 * 3 + 10 * 2 + 3);
-    EXPECT_EQ(analysis.blocks[0].stack_req, 3);
-    EXPECT_EQ(analysis.blocks[0].stack_max_growth, 7);
+    EXPECT_EQ(analysis.instrs[0].arg.block.gas_cost, 7 * 3 + 10 * 2 + 3);
+    EXPECT_EQ(analysis.instrs[0].arg.block.stack_req, 3);
+    EXPECT_EQ(analysis.instrs[0].arg.block.stack_max_growth, 7);
 }
 
 TEST(analysis, push)
@@ -82,7 +78,6 @@ TEST(analysis, jump1)
     const auto code = jump(add(4, 2)) + OP_JUMPDEST + mstore(0, 3) + ret(0, 0x20) + jump(6);
     const auto analysis = analyze(fake_fn_table, rev, &code[0], code.size());
 
-    ASSERT_EQ(analysis.blocks.size(), 3);
     ASSERT_EQ(analysis.jumpdest_offsets.size(), 1);
     ASSERT_EQ(analysis.jumpdest_targets.size(), 1);
     EXPECT_EQ(analysis.jumpdest_offsets[0], 6);
@@ -97,7 +92,6 @@ TEST(analysis, empty)
     bytes code;
     auto analysis = evmone::analyze(fake_fn_table, rev, &code[0], code.size());
 
-    EXPECT_EQ(analysis.blocks.size(), 0);
     EXPECT_EQ(analysis.instrs.size(), 1);
     EXPECT_EQ(analysis.instrs.back().fn, fake_fn_table[OP_STOP]);
 }
@@ -107,7 +101,6 @@ TEST(analysis, only_jumpdest)
     auto code = from_hex("5b");
     auto analysis = evmone::analyze(fake_fn_table, rev, &code[0], code.size());
 
-    ASSERT_EQ(analysis.blocks.size(), 1);
     ASSERT_EQ(analysis.jumpdest_offsets.size(), 1);
     ASSERT_EQ(analysis.jumpdest_targets.size(), 1);
     EXPECT_EQ(analysis.jumpdest_offsets[0], 0);
@@ -119,6 +112,5 @@ TEST(analysis, jumpi_at_the_end)
     auto code = from_hex("57");
     auto analysis = evmone::analyze(fake_fn_table, rev, &code[0], code.size());
 
-    EXPECT_EQ(analysis.blocks.size(), 1);
     EXPECT_EQ(analysis.instrs.back().fn, fake_fn_table[OP_STOP]);
 }

test/utils/dump.cpp

@@ -28,7 +28,7 @@ void dump_analysis(const evmone::code_analysis& analysis)
 
         if (c == OPX_BEGINBLOCK)
         {
-            block = &analysis.blocks[size_t(instr.arg.p.number)];
+            block = &instr.arg.block;
 
             const auto get_jumpdest_offset = [&analysis](size_t index) noexcept
             {