[BOLT] Ensure remember and restore CFIs are in the same list

Ash Dobrescu · Ash Dobrescu · commit 75cc116385ba · 2025-07-02T11:37:38.000Z
diff --git a/bolt/include/bolt/Core/BinaryFunction.h b/bolt/include/bolt/Core/BinaryFunction.h
@@ -1663,7 +1663,7 @@ class BinaryFunction {
       Offset = I->first;
     }
     assert(I->first == Offset && "CFI pointing to unknown instruction");
-    if (I == Instructions.begin()) {
+    if (I == Instructions.begin() && Inst.getOperation() != MCCFIInstruction::OpRememberState) {
       CIEFrameInstructions.emplace_back(std::forward<MCCFIInstruction>(Inst));
       return;
     }

Original file line number	Diff line number	Diff line change
`@@ -1663,7 +1663,7 @@ class BinaryFunction {`
`1663`	`1663`	`Offset = I->first;`
`1664`	`1664`	`}`
`1665`	`1665`	`assert(I->first == Offset && "CFI pointing to unknown instruction");`
`1666`		`- if (I == Instructions.begin()) {`
	`1666`	`+ if (I == Instructions.begin() && Inst.getOperation() != MCCFIInstruction::OpRememberState) {`
`1667`	`1667`	`CIEFrameInstructions.emplace_back(std::forward<MCCFIInstruction>(Inst));`
`1668`	`1668`	`return;`
`1669`	`1669`	`}`