[MC] Also sort on IsBKeyFrame

[fmayer]

add test

[fmayer]

tabs

[fmayer]

llvm/test/MC/ELF/AArch64/cfi.s

1 ↗

(On Diff #466892)

The assembly in this file is a copy of test/MC/ELF/cfi.s, with cfi_b_key_frame added. I am not especially fond of this test, and we should maybe change it to use llvm-dwarfinfo instead to get a textual representation.

[eugenis]

LGTM

llvm/test/MC/ELF/AArch64/cfi.s

1 ↗

(On Diff #466892)

I agree, but I'm also fine with copying the test first and refactoring both later.

llvm/lib/MC/MCDwarf.cpp

struct CIEKey {
   StringRef PersonalityName() const {
     if (!Personality)
       return StringRef();
     return Personality->getName();
   }
 
   bool operator<(const CIEKey &Other) const {
     return std::make_tuple(PersonalityName(), PersonalityEncoding, LsdaEncoding,
-                           IsSignalFrame, IsSimple, RAReg) <
+                           IsSignalFrame, IsSimple, RAReg, IsBKeyFrame) <
            std::make_tuple(Other.PersonalityName(), Other.PersonalityEncoding,
                            Other.LsdaEncoding, Other.IsSignalFrame,
-                           Other.IsSimple, Other.RAReg);
+                           Other.IsSimple, Other.RAReg, Other.IsBKeyFrame);
   }
 
   const MCSymbol *Personality;
   unsigned PersonalityEncoding;
   unsigned LsdaEncoding;
   bool IsSignalFrame;
   bool IsSimple;
   unsigned RAReg;