summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Object/IRSymtab.cpp
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2017-09-07 01:33:52 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2017-09-07 01:33:52 +0000
commit4899a923db9849357accf8d6b580a273fc1b2629 (patch)
treeb623b14436460335b9637fb6e61668374c5306ea /llvm/lib/Object/IRSymtab.cpp
parent3ced3d90c369d6e9aca58888573837d597bb9295 (diff)
downloadbcm5719-llvm-4899a923db9849357accf8d6b580a273fc1b2629.tar.gz
bcm5719-llvm-4899a923db9849357accf8d6b580a273fc1b2629.zip
Object: Downgrade invalid weak externals from an assert fail to an llvm::Error when creating an irsymtab.
This fixes bitcode emission for modules containing invalid weak externals. llvm-svn: 312686
Diffstat (limited to 'llvm/lib/Object/IRSymtab.cpp')
-rw-r--r--llvm/lib/Object/IRSymtab.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/llvm/lib/Object/IRSymtab.cpp b/llvm/lib/Object/IRSymtab.cpp
index 668cf62d1e8..7fc84e2046c 100644
--- a/llvm/lib/Object/IRSymtab.cpp
+++ b/llvm/lib/Object/IRSymtab.cpp
@@ -231,11 +231,14 @@ Error Builder::addSymbol(const ModuleSymbolTable &Msymtab,
if ((Flags & object::BasicSymbolRef::SF_Weak) &&
(Flags & object::BasicSymbolRef::SF_Indirect)) {
+ auto *Fallback = dyn_cast<GlobalValue>(
+ cast<GlobalAlias>(GV)->getAliasee()->stripPointerCasts());
+ if (!Fallback)
+ return make_error<StringError>("Invalid weak external",
+ inconvertibleErrorCode());
std::string FallbackName;
raw_string_ostream OS(FallbackName);
- Msymtab.printSymbolName(
- OS, cast<GlobalValue>(
- cast<GlobalAlias>(GV)->getAliasee()->stripPointerCasts()));
+ Msymtab.printSymbolName(OS, Fallback);
OS.flush();
setStr(Uncommon().COFFWeakExternFallbackName, Saver.save(FallbackName));
}
OpenPOWER on IntegriCloud