[llvm] [CFIInserter] Improve `CSRSavedLocation` struct. (PR #168869)

Craig Topper via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 10 13:21:43 PST 2025


================
@@ -277,10 +319,19 @@ void CFIInstrInserter::calculateOutgoingCFAInfo(MBBCFAInfo &MBBInfo) {
       case MCCFIInstruction::OpValOffset:
         break;
       }
-      if (CSRReg || CSROffset) {
-        CSRSavedLocation Loc(CSRReg, CSROffset);
-        auto [It, Inserted] = CSRLocMap.insert({CFI.getRegister(), Loc});
-        if (!Inserted && It->second != Loc) {
+      assert((bool)CSRReg + (bool)CSROffset <= 1 &&
----------------
topperc wrote:

```suggestion
      assert((!CSRReg.has_value() || !CSROffset.has_value()) &&
```

https://github.com/llvm/llvm-project/pull/168869


More information about the llvm-commits mailing list