[llvm-commits] [llvm] r149180 - in /llvm/trunk: lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp test/MC/ARM/pr11877.s test/MC/Mips/pr11877.s

[James Molloy]

Author: jamesm
Date: Sat Jan 28 09:58:32 2012
New Revision: 149180

URL: http://llvm.org/viewvc/llvm-project?rev=149180&view=rev
Log:
Ensure .AliasedSymbol() is called on all uses of getSymbol(). Affects ARM and MIPS ELF backends.

Fixes PR11877


Added:
    llvm/trunk/test/MC/ARM/pr11877.s
    llvm/trunk/test/MC/Mips/pr11877.s
Modified:
    llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
    llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp

Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp?rev=149180&r1=149179&r2=149180&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp Sat Jan 28 09:58:32 2012
@@ -69,7 +69,7 @@
                                                    const MCFragment &F,
                                                    const MCFixup &Fixup,
                                                    bool IsPCRel) const {
-  const MCSymbol &Symbol = Target.getSymA()->getSymbol();
+  const MCSymbol &Symbol = Target.getSymA()->getSymbol().AliasedSymbol();
   bool EmitThisSym = false;
 
   const MCSectionELF &Section =

Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp?rev=149180&r1=149179&r2=149180&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp Sat Jan 28 09:58:32 2012
@@ -53,7 +53,7 @@
                                                     const MCFixup &Fixup,
                                                     bool IsPCRel) const {
   assert(Target.getSymA() && "SymA cannot be 0.");
-  const MCSymbol &Sym = Target.getSymA()->getSymbol();
+  const MCSymbol &Sym = Target.getSymA()->getSymbol().AliasedSymbol();
 
   if (Sym.getSection().getKind().isMergeableCString() ||
       Sym.getSection().getKind().isMergeableConst())

Added: llvm/trunk/test/MC/ARM/pr11877.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/pr11877.s?rev=149180&view=auto
==============================================================================
--- llvm/trunk/test/MC/ARM/pr11877.s (added)
+++ llvm/trunk/test/MC/ARM/pr11877.s Sat Jan 28 09:58:32 2012
@@ -0,0 +1,6 @@
+// RUN: llvm-mc -triple arm-unknown-unknown %s
+
+i:
+        .long    g
+g = h
+h = i

Added: llvm/trunk/test/MC/Mips/pr11877.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/pr11877.s?rev=149180&view=auto
==============================================================================
--- llvm/trunk/test/MC/Mips/pr11877.s (added)
+++ llvm/trunk/test/MC/Mips/pr11877.s Sat Jan 28 09:58:32 2012
@@ -0,0 +1,6 @@
+// RUN: llvm-mc -triple mips-unknown-unknown %s
+
+i:
+        .long    g
+g = h
+h = i