fix

Author: daniilavdeev

llvm/include/llvm/MC/MCObjectStreamer.h

@@ -209,6 +209,9 @@ class MCObjectStreamer : public MCStreamer {
   void emitPendingAssignments(MCSymbol *Symbol);
 };
 
+std::optional<uint64_t> absoluteSymbolDiff(const MCSymbol *Hi,
+                                           const MCSymbol *Lo);
+
 } // end namespace llvm
 
 #endif

llvm/include/llvm/MC/MCSymbol.h

@@ -383,8 +383,6 @@ inline raw_ostream &operator<<(raw_ostream &OS, const MCSymbol &Sym) {
   return OS;
 }
 
-bool isRangeRelaxable(const MCSymbol *Begin, const MCSymbol *End);
-
 } // end namespace llvm
 
 #endif // LLVM_MC_MCSYMBOL_H

llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp

@@ -40,6 +40,7 @@
 #include "llvm/IR/Module.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
+#include "llvm/MC/MCObjectStreamer.h"
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCSymbol.h"
@@ -3372,7 +3373,8 @@ emitRangeList(DwarfDebug &DD, AsmPrinter *Asm, MCSymbol *Sym, const Ranges &R,
           Asm->emitLabelDifference(End, Base, Size);
         }
       } else if (UseDwarf5) {
-        if (DD.useSplitDwarf() && llvm::isRangeRelaxable(Begin, End)) {
+        if (DD.useSplitDwarf() &&
+            !llvm::absoluteSymbolDiff(Begin, End).has_value()) {
           Asm->OutStreamer->AddComment(StringifyEnum(StartxEndx));
           Asm->emitInt8(StartxEndx);
           Asm->OutStreamer->AddComment("  start index");

llvm/lib/MC/MCObjectStreamer.cpp

@@ -129,8 +129,8 @@ void MCObjectStreamer::addFixup(const MCExpr *Value, MCFixupKind Kind) {
 // As a compile-time optimization, avoid allocating and evaluating an MCExpr
 // tree for (Hi - Lo) when Hi and Lo are offsets into the same fragment's fixed
 // part.
-static std::optional<uint64_t> absoluteSymbolDiff(const MCSymbol *Hi,
-                                                  const MCSymbol *Lo) {
+std::optional<uint64_t> llvm::absoluteSymbolDiff(const MCSymbol *Hi,
+                                                 const MCSymbol *Lo) {
   assert(Hi && Lo);
   if (Lo == Hi)
     return 0;

llvm/lib/MC/MCSymbol.cpp

@@ -86,15 +86,3 @@ void MCSymbol::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
 #if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
 LLVM_DUMP_METHOD void MCSymbol::dump() const { dbgs() << *this; }
 #endif
-
-bool llvm::isRangeRelaxable(const MCSymbol *Begin, const MCSymbol *End) {
-  assert(Begin && "Range without a begin symbol?");
-  assert(End && "Range without an end symbol?");
-  for (const auto *Fragment = Begin->getFragment();
-       Fragment != End->getFragment(); Fragment = Fragment->getNext()) {
-    assert(Fragment);
-    if (Fragment->isLinkerRelaxable())
-      return true;
-  }
-  return false;
-}