summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine/JIT
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-03-27 15:26:56 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-03-27 15:26:56 +0000
commit24a669d225f9cacf1cd3846e333f9690a06d1e1c (patch)
treeb470c3e65a0da9bb79b4696506dbe4fda36bf3fa /llvm/lib/ExecutionEngine/JIT
parentfd2b75948df6e27820fb0e086e4c2bbb4fc9bd28 (diff)
downloadbcm5719-llvm-24a669d225f9cacf1cd3846e333f9690a06d1e1c.tar.gz
bcm5719-llvm-24a669d225f9cacf1cd3846e333f9690a06d1e1c.zip
Prevent alias from pointing to weak aliases.
This adds back r204781. Original message: Aliases are just another name for a position in a file. As such, the regular symbol resolutions are not applied. For example, given define void @my_func() { ret void } @my_alias = alias weak void ()* @my_func @my_alias2 = alias void ()* @my_alias We produce without this patch: .weak my_alias my_alias = my_func .globl my_alias2 my_alias2 = my_alias That is, in the resulting ELF file my_alias, my_func and my_alias are just 3 names pointing to offset 0 of .text. That is *not* the semantics of IR linking. For example, linking in a @my_alias = alias void ()* @other_func would require the strong my_alias to override the weak one and my_alias2 would end up pointing to other_func. There is no way to represent that with aliases being just another name, so the best solution seems to be to just disallow it, converting a miscompile into an error. llvm-svn: 204934
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 4b2f012eafb..9d215ec96ae 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->resolveAliasedGlobal(false));
+ return TheJIT->getPointerToGlobal(GA->getAliasedGlobal());
// If we have already compiled the function, return a pointer to its body.
Function *F = cast<Function>(V);
OpenPOWER on IntegriCloud