track handled blocks

Author: webmiche

llvm/lib/Transforms/Utils/CFFunctionInstrumentation.cpp

@@ -36,10 +36,14 @@ CFFunctionInstrumentationPass::run(Module &M, ModuleAnalysisManager &AM) {
     StringRef funcFileName = StringRef(fileName);
     // for all return instructions, print the return value to a file with the
     // name of the function
+
+    // store already handled blocks
+    std::set<BasicBlock *> HandledBlocks;
     for (auto &BB : F) {
       // Do NOT reinstrument the inserted blocks
       if (BB.getName() == "return" || BB.getName() == "print" ||
           BB.getName() == "open") {
+            HandledBlocks.insert(&BB);
         continue;
       }
       if (auto *RI = dyn_cast<ReturnInst>(BB.getTerminator())) {
@@ -118,6 +122,7 @@ CFFunctionInstrumentationPass::run(Module &M, ModuleAnalysisManager &AM) {
           ReturnBB->moveAfter(PrintBB);
         }
       }
+      HandledBlocks.insert(&BB);
     }
   }