diff options
| author | Bill Schmidt <wschmidt@linux.vnet.ibm.com> | 2013-01-07 19:29:18 +0000 |
|---|---|---|
| committer | Bill Schmidt <wschmidt@linux.vnet.ibm.com> | 2013-01-07 19:29:18 +0000 |
| commit | 5b7f9216c357f1cdf507f300f396b44cb982eb3f (patch) | |
| tree | 0ec0da8431762da98a57a1a6a7dc944053f46836 /lib/Target/PowerPC/PPCAsmPrinter.cpp | |
| parent | 3ebe59c892051375623fea55e977ff559fdb3323 (diff) | |
| download | llvm-5b7f9216c357f1cdf507f300f396b44cb982eb3f.tar.gz llvm-5b7f9216c357f1cdf507f300f396b44cb982eb3f.tar.bz2 llvm-5b7f9216c357f1cdf507f300f396b44cb982eb3f.tar.xz | |
This patch addresses bug 14678 by fixing two problems in medium code model
code generation. Variables addressed through a GlobalAlias were not being
handled, and variables with available_externally linkage were treated
incorrectly. The patch contains two new tests to verify the correct code
generation for these cases.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171778 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/PowerPC/PPCAsmPrinter.cpp')
| -rw-r--r-- | lib/Target/PowerPC/PPCAsmPrinter.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp index 85f00ddc4b..adb673b60c 100644 --- a/lib/Target/PowerPC/PPCAsmPrinter.cpp +++ b/lib/Target/PowerPC/PPCAsmPrinter.cpp @@ -426,20 +426,25 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) { bool IsExternal = false; bool IsFunction = false; bool IsCommon = false; + bool IsAvailExt = false; if (MO.isGlobal()) { const GlobalValue *GValue = MO.getGlobal(); - MOSymbol = Mang->getSymbol(GValue); - const GlobalVariable *GVar = dyn_cast<GlobalVariable>(GValue); + const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue); + const GlobalValue *RealGValue = GAlias ? + GAlias->resolveAliasedGlobal(false) : GValue; + MOSymbol = Mang->getSymbol(RealGValue); + const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue); IsExternal = GVar && !GVar->hasInitializer(); - IsCommon = GVar && GValue->hasCommonLinkage(); + IsCommon = GVar && RealGValue->hasCommonLinkage(); IsFunction = !GVar; + IsAvailExt = GVar && RealGValue->hasAvailableExternallyLinkage(); } else if (MO.isCPI()) MOSymbol = GetCPISymbol(MO.getIndex()); else if (MO.isJTI()) MOSymbol = GetJTISymbol(MO.getIndex()); - if (IsExternal || IsFunction || IsCommon || MO.isJTI()) + if (IsExternal || IsFunction || IsCommon || IsAvailExt || MO.isJTI()) MOSymbol = lookUpOrCreateTOCEntry(MOSymbol); const MCExpr *Exp = @@ -466,10 +471,14 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) { MOSymbol = lookUpOrCreateTOCEntry(GetJTISymbol(MO.getIndex())); else { const GlobalValue *GValue = MO.getGlobal(); - MOSymbol = Mang->getSymbol(GValue); - const GlobalVariable *GVar = dyn_cast<GlobalVariable>(GValue); + const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue); + const GlobalValue *RealGValue = GAlias ? + GAlias->resolveAliasedGlobal(false) : GValue; + MOSymbol = Mang->getSymbol(RealGValue); + const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue); - if (!GVar || !GVar->hasInitializer() || GValue->hasCommonLinkage()) + if (!GVar || !GVar->hasInitializer() || RealGValue->hasCommonLinkage() || + RealGValue->hasAvailableExternallyLinkage()) MOSymbol = lookUpOrCreateTOCEntry(MOSymbol); } @@ -496,8 +505,11 @@ void PPCAsmPrinter::EmitInstruction(const MachineInstr *MI) { if (MO.isGlobal()) { const GlobalValue *GValue = MO.getGlobal(); - MOSymbol = Mang->getSymbol(GValue); - const GlobalVariable *GVar = dyn_cast<GlobalVariable>(GValue); + const GlobalAlias *GAlias = dyn_cast<GlobalAlias>(GValue); + const GlobalValue *RealGValue = GAlias ? + GAlias->resolveAliasedGlobal(false) : GValue; + MOSymbol = Mang->getSymbol(RealGValue); + const GlobalVariable *GVar = dyn_cast<GlobalVariable>(RealGValue); IsExternal = GVar && !GVar->hasInitializer(); IsFunction = !GVar; } else if (MO.isCPI()) |