Allow forward references to section symbols.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219835 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/MC/MCContext.cpp b/lib/MC/MCContext.cpp
index 3ac8d658873f3107c823eab592111cb8ceb43175..ea6db142fd7b3096fbf4b69669a80a517523884f 100644 (file)
--- a/lib/MC/MCContext.cpp
+++ b/lib/MC/MCContext.cpp
@@ -119,11 +119,18 @@ MCSymbol *MCContext::getOrCreateSectionSymbol(const MCSectionELF &Section) {
     return Sym;
 
   StringRef Name = Section.getSectionName();
     return Sym;
 
   StringRef Name = Section.getSectionName();

+
+  StringMapEntry<MCSymbol*> &Entry = Symbols.GetOrCreateValue(Name);
+  MCSymbol *OldSym = Entry.getValue();
+  if (OldSym && OldSym->isUndefined()) {
+    Sym = OldSym;
+    return OldSym;
+  }
+

   StringMapEntry<bool> *NameEntry = &UsedNames.GetOrCreateValue(Name);
   NameEntry->setValue(true);
   Sym = new (*this) MCSymbol(NameEntry->getKey(), /*isTemporary*/ false);
 
   StringMapEntry<bool> *NameEntry = &UsedNames.GetOrCreateValue(Name);
   NameEntry->setValue(true);
   Sym = new (*this) MCSymbol(NameEntry->getKey(), /*isTemporary*/ false);
 

-  StringMapEntry<MCSymbol*> &Entry = Symbols.GetOrCreateValue(Name);

   if (!Entry.getValue())
     Entry.setValue(Sym);
 
   if (!Entry.getValue())
     Entry.setValue(Sym);
 

diff --git a/test/MC/ELF/section-sym2.s b/test/MC/ELF/section-sym2.s
new file mode 100644 (file)
index 0000000..acdb7d9
--- /dev/null
+++ b/test/MC/ELF/section-sym2.s
@@ -0,0 +1,28 @@
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | llvm-readobj  -t -r --expand-relocs | FileCheck %s
+
+// Test that we can forward reference a section.
+
+mov .rodata, %rsi
+.section .rodata
+
+// CHECK:Relocations [
+// CHECK:  Section (2) .rela.text {
+// CHECK:    Relocation {
+// CHECK:      Offset: 0x4
+// CHECK:      Type: R_X86_64_32S (11)
+// CHECK:      Symbol: .rodata
+// CHECK:      Addend: 0x0
+// CHECK:    }
+// CHECK:  }
+// CHECK:]
+
+// There is only one .rodata symbol
+
+// CHECK:Symbols [
+// CHECK-NOT:    Name: .rodata
+// CHECK:        Name: .rodata
+// CHECK-NEXT:   Value: 0x0
+// CHECK-NEXT:   Size: 0
+// CHECK-NEXT:   Binding: Local (0x0)
+// CHECK-NEXT:   Type: Section (0x3)
+// CHECK-NOT:    Name: .rodata