fix: add the block expression to the correct basic block contents

Author: XMadrid

instrumentation/BasicBlockWalker.cpp

@@ -20,7 +20,7 @@ void BasicBlockWalker::basicBlockWalk() noexcept {
 }
 
 void BasicBlockWalker::visitExpression(wasm::Expression *curr) noexcept {
-  if (currBasicBlock == nullptr) {
+  if (currBasicBlock == nullptr || curr->is<wasm::Block>()) {
     return;
   }
   // push information
@@ -33,6 +33,14 @@ void BasicBlockWalker::visitExpression(wasm::Expression *curr) noexcept {
   }
 }
 
+void BasicBlockWalker::doEndBlock(BasicBlockWalker *self, wasm::Expression **currp) {
+  wasm::CFGWalker<BasicBlockWalker, wasm::UnifiedExpressionVisitor<BasicBlockWalker>,
+  BasicBlockInfo>::doEndBlock(self, currp);
+  if (self->currBasicBlock != nullptr) {
+    self->currBasicBlock->contents.exprs.push_back(*currp);
+  }
+}
+
 static bool
 isBasicBlockContainUnreachable(BasicBlockWalker::BasicBlock &block,
                                std::set<BasicBlockWalker::BasicBlock *> unreachableBlocks) {

instrumentation/BasicBlockWalker.hpp

@@ -120,6 +120,8 @@ class BasicBlockWalker final
   ///@param curr Current expression
   void visitExpression(wasm::Expression *const curr) noexcept;
 
+  static void doEndBlock(BasicBlockWalker* self, wasm::Expression** currp);
+
   ///
   ///@brief Inherit from CFGWalker for function visitor
   ///

tests/cpp/lit/covInstrument/do_while_break.wast.debug.json

@@ -26,7 +26,6 @@
           [0, 7, 18]
         ],
         [[0, 4, 2]],
-        [[0, 4, 2]],
         [[0, 8, 9]]
       ]
     }

tests/cpp/lit/covInstrument/do_while_break.wast.run.log

@@ -11,4 +11,3 @@ basic block entry trace to: function=0, basic block=3
 basic block entry trace to: function=0, basic block=1
 basic block entry trace to: function=0, basic block=2
 basic block entry trace to: function=0, basic block=5
-basic block entry trace to: function=0, basic block=6

tests/cpp/lit/covInstrument/do_while_continue.wast.debug.json

@@ -3,10 +3,10 @@
   "debugInfos": {
     "main": {
       "branchInfo": [
-        [1, 2],
         [1, 3],
-        [4, 5],
-        [4, 1]
+        [1, 2],
+        [3, 4],
+        [3, 1]
       ],
       "index": 0,
       "lineInfo": [
@@ -21,7 +21,6 @@
           [0, 6, 16]
         ],
         [[0, 6, 19]],
-        [[0, 4, 2]],
         [
           [0, 7, 10],
           [0, 7, 18]

tests/cpp/lit/covInstrument/do_while_continue.wast.run.log

@@ -2,10 +2,8 @@ make directly call to function index=0
 basic block entry trace to: function=0, basic block=0
 basic block entry trace to: function=0, basic block=1
 basic block entry trace to: function=0, basic block=3
-basic block entry trace to: function=0, basic block=4
 basic block entry trace to: function=0, basic block=1
 basic block entry trace to: function=0, basic block=2
 basic block entry trace to: function=0, basic block=3
 basic block entry trace to: function=0, basic block=4
 basic block entry trace to: function=0, basic block=5
-basic block entry trace to: function=0, basic block=6

tests/cpp/lit/covInstrument/do_while_once.wast.debug.json

@@ -29,13 +29,9 @@
           [0, 8, 16]
         ],
         [[0, 8, 20]],
-        [
-          [0, 4, 2],
-          [0, 9, 4]
-        ],
+        [[0, 9, 4]],
         [[0, 10, 11]],
         [[0, 4, 2]],
-        [[0, 4, 2]],
         [
           [0, 11, 9],
           [0, 11, 17]

tests/cpp/lit/covInstrument/do_while_once.wast.run.log

@@ -6,4 +6,3 @@ basic block entry trace to: function=0, basic block=4
 basic block entry trace to: function=0, basic block=6
 basic block entry trace to: function=0, basic block=7
 basic block entry trace to: function=0, basic block=8
-basic block entry trace to: function=0, basic block=9

tests/cpp/lit/covInstrument/for_loop_break.wast.debug.json

@@ -30,7 +30,6 @@
           [0, 6, 13]
         ],
         [[0, 4, 19]],
-        [[0, 4, 19]],
         [[0, 8, 9]]
       ]
     }

tests/cpp/lit/covInstrument/for_loop_break.wast.run.log

@@ -22,4 +22,3 @@ basic block entry trace to: function=0, basic block=1
 basic block entry trace to: function=0, basic block=2
 basic block entry trace to: function=0, basic block=3
 basic block entry trace to: function=0, basic block=6
-basic block entry trace to: function=0, basic block=7