diff --git a/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.cpp b/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.cpp
index 6229fb629..e2f5fdbeb 100644
--- a/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.cpp
+++ b/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.cpp
@@ -20,6 +20,7 @@ Analysis::InterruptType Analysis::transfer(BasicBlockNode *InputBB) {
   revng_assert(OriginalBB);
   bool New = VisibleBB.insert(std::make_pair(OriginalBB, InputBB)).second;
   revng_assert(New);
+  BBViewMap[InputBB] = VisibleBB.copy();
   return InterruptType::createInterrupt(std::move(VisibleBB));
 }
 
diff --git a/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.h b/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.h
index 5badc7759..e8a06b2e7 100644
--- a/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.h
+++ b/lib/EnforceCFGCombingPass/BasicBlockViewAnalysis.h
@@ -87,6 +87,8 @@ public: // map methods
 
 };
 
+using BBNodeBBViewMap = std::map<BasicBlockNode *, BasicBlockViewMap>;
+
 class Analysis
   : public MonotoneFramework<Analysis,
                              BasicBlockNode *,
@@ -96,6 +98,7 @@ class Analysis
 private:
   CFG &RegionCFGTree;
   const llvm::Function &OriginalFunction;
+  BBNodeBBViewMap BBViewMap;
 
 public:
   using Base = MonotoneFramework<Analysis,
@@ -117,6 +120,7 @@ public:
 
   void initialize() {
     Base::initialize();
+    BBViewMap.clear();
   }
 
   void assertLowerThanOrEqual(const BasicBlockViewMap &A,
@@ -124,6 +128,10 @@ public:
     revng_assert(A.lowerThanOrEqual(B));
   }
 
+  const BBNodeBBViewMap &getBBNodeBBViewMap() const {
+    return BBViewMap;
+  }
+
   /// This Analysis uses DefaultInterrupt, hence it is never supposed to dump
   /// the final state.
   void dumpFinalState() const { revng_abort(); }