summaryrefslogtreecommitdiff
path: root/lib/Target/XCore
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-03-26 06:14:40 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-03-26 06:14:40 +0000
commit72db10a9959431a710712f64d4b98299ab5a022d (patch)
tree8ea039520d3cec3f1adcf367c2a6915744f6a559 /lib/Target/XCore
parent360ee971798ebccc177f7e1c2947a74e3bd9fbc0 (diff)
downloadllvm-72db10a9959431a710712f64d4b98299ab5a022d.tar.gz
llvm-72db10a9959431a710712f64d4b98299ab5a022d.tar.bz2
llvm-72db10a9959431a710712f64d4b98299ab5a022d.tar.xz
Revert "Prevent alias from pointing to weak aliases."
This reverts commit r204781. I will follow up to with msan folks to see what is what they were trying to do with aliases to weak aliases. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204784 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/XCore')
-rw-r--r--lib/Target/XCore/XCoreISelLowering.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/XCore/XCoreISelLowering.cpp b/lib/Target/XCore/XCoreISelLowering.cpp
index 1b74013ac1..079e886457 100644
--- a/lib/Target/XCore/XCoreISelLowering.cpp
+++ b/lib/Target/XCore/XCoreISelLowering.cpp
@@ -277,7 +277,7 @@ getGlobalAddressWrapper(SDValue GA, const GlobalValue *GV,
const GlobalValue *UnderlyingGV = GV;
// If GV is an alias then use the aliasee to determine the wrapper type
if (const GlobalAlias *GA = dyn_cast<GlobalAlias>(GV))
- UnderlyingGV = GA->getAliasedGlobal();
+ UnderlyingGV = GA->resolveAliasedGlobal();
if (const GlobalVariable *GVar = dyn_cast<GlobalVariable>(UnderlyingGV)) {
if ( ( GVar->isConstant() &&
UnderlyingGV->isLocalLinkage(GV->getLinkage()) )