summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine/JIT
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
commit65481d7b97b89761ca118ea3e63747212eaafe11 (patch)
treef2b9b4e1f6ce8677c3453c94b0670a4e1062309b /llvm/lib/ExecutionEngine/JIT
parent02633f63ebe7a631b02e9c62b432b7449345b2b6 (diff)
downloadbcm5719-llvm-65481d7b97b89761ca118ea3e63747212eaafe11.tar.gz
bcm5719-llvm-65481d7b97b89761ca118ea3e63747212eaafe11.zip
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. llvm-svn: 204784
Diffstat (limited to 'llvm/lib/ExecutionEngine/JIT')
-rw-r--r--llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
index 9d215ec96ae..4b2f012eafb 100644
--- a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp
@@ -688,7 +688,7 @@ void *JITEmitter::getPointerToGlobal(GlobalValue *V, void *Reference,
return TheJIT->getOrEmitGlobalVariable(GV);
if (GlobalAlias *GA = dyn_cast<GlobalAlias>(V))
- return TheJIT->getPointerToGlobal(GA->getAliasedGlobal());
+ return TheJIT->getPointerToGlobal(GA->resolveAliasedGlobal(false));
// If we have already compiled the function, return a pointer to its body.
Function *F = cast<Function>(V);
OpenPOWER on IntegriCloud