fixup! [AsmWriter] Ensure getMnemonic doesn't return invalid pointers

pratlucas · Dec 18, 2023 · 1326609 · 1326609
1 parent b048817
commit 1326609
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/llvm/lib/MC/MCAsmStreamer.cpp b/llvm/lib/MC/MCAsmStreamer.cpp
@@ -154,10 +154,10 @@ class MCAsmStreamer final : public MCStreamer {
  void emitGNUAttribute(unsigned Tag, unsigned Value) override;
 
  StringRef getMnemonic(MCInst &MI) override {
- std::pair<const char *, uint64_t> M = InstPrinter->getMnemonic(&MI);
- assert((M.second != 0 || M.first == nullptr) &&
+ auto [Ptr, Bits] = InstPrinter->getMnemonic(&MI);
+ assert((Bits != 0 || Ptr == nullptr) &&
  "Invalid char pointer for instruction with no mnemonic");
- return M.first;
+ return Ptr;
  }
 
  void emitLabel(MCSymbol *Symbol, SMLoc Loc = SMLoc()) override;