LOCALMODs from hg 0b098ca44de7 against r158408 (hg 90a87d6bfe45)

(only non-new files; new files in git 4f429c8b)

Change-Id: Ia39f818088485bd90e4d048db404f8d6ba5f836b

1 files changed, 18 insertions, 2 deletions

diff --git a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
index 7a89e3ca63..bdc27485a7 100644
--- a/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+++ b/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
@@ -55,8 +55,16 @@ TargetLoweringObjectFileELF::getCFIPersonalitySymbol(const GlobalValue *GV,
   case dwarf::DW_EH_PE_absptr:
     return  Mang->getSymbol(GV);
   case dwarf::DW_EH_PE_pcrel: {
+    // @LOCALMOD-BEGIN
+    // The dwarf section label should not include the version suffix.
+    // Strip it off here.
+    StringRef Name = Mang->getSymbol(GV)->getName();
+    size_t atpos = Name.find("@");
+    if (atpos != StringRef::npos)
+      Name = Name.substr(0, atpos);
+    // @LOCALMOD-END
     return getContext().GetOrCreateSymbol(StringRef("DW.ref.") +
-                                          Mang->getSymbol(GV)->getName());
+                                          Name); // @LOCALMOD
   }
   }
 }
@@ -65,7 +73,15 @@ void TargetLoweringObjectFileELF::emitPersonalityValue(MCStreamer &Streamer,
                                                        const TargetMachine &TM,
                                                        const MCSymbol *Sym) const {
   SmallString<64> NameData("DW.ref.");
-  NameData += Sym->getName();
+  // @LOCALMOD-BEGIN
+  // The dwarf section label should not include the version suffix.
+  // Strip it off here.
+  StringRef Name = Sym->getName();
+  size_t atpos = Name.find("@");
+  if (atpos != StringRef::npos)
+    Name = Name.substr(0, atpos);
+  // @LOCALMOD-END
+  NameData += Name; // @LOCALMOD
   MCSymbol *Label = getContext().GetOrCreateSymbol(NameData);
   Streamer.EmitSymbolAttribute(Label, MCSA_Hidden);
   Streamer.EmitSymbolAttribute(Label, MCSA_Weak);