optimize multiple shape to contain a map based on ids, not blocks, so we re-merge split nodes early

1 files changed, 4 insertions, 3 deletions

diff --git a/src/relooper/Relooper.h b/src/relooper/Relooper.h
index 152bae0e..7d80e162 100644
--- a/src/relooper/Relooper.h
+++ b/src/relooper/Relooper.h
@@ -132,8 +132,6 @@ struct SimpleShape : public Shape {
   }
 };
 
-typedef std::map<Block*, Shape*> BlockShapeMap;
-
 // A shape that may be implemented with a labeled loop.
 struct LabeledShape : public Shape {
   bool Labeled; // If we have a loop, whether it needs to be labeled
@@ -141,8 +139,11 @@ struct LabeledShape : public Shape {
   LabeledShape(ShapeType TypeInit) : Shape(TypeInit), Labeled(false) {}
 };
 
+// Blocks with the same id were split and are identical, so we just care about ids in Multiple entries
+typedef std::map<int, Shape*> IdShapeMap;
+
 struct MultipleShape : public LabeledShape {
-  BlockShapeMap InnerMap; // entry block -> shape
+  IdShapeMap InnerMap; // entry block ID -> shape
   int NeedLoop; // If we have branches, we need a loop. This is a counter of loop requirements,
                 // if we optimize it to 0, the loop is unneeded