summaryrefslogtreecommitdiffstats
path: root/llvm/lib/ExecutionEngine/Orc/Layer.cpp
diff options
context:
space:
mode:
authorLang Hames <lhames@gmail.com>2018-08-05 23:55:35 +0000
committerLang Hames <lhames@gmail.com>2018-08-05 23:55:35 +0000
commitefd72d6a857345ec8b49ba6336af4186ed38032d (patch)
tree750fccb1a6a023092e44ad6872ca8f16decf86b8 /llvm/lib/ExecutionEngine/Orc/Layer.cpp
parentc0514f00bfdc10c87b80b67109fc77b8f24cfd2d (diff)
downloadbcm5719-llvm-efd72d6a857345ec8b49ba6336af4186ed38032d.tar.gz
bcm5719-llvm-efd72d6a857345ec8b49ba6336af4186ed38032d.zip
[ORC] Remove an incorrect use of 'cantFail'.
This code was moved out from BasicObjectLayerMaterializationUnit, which required the supplied object to be well formed. The getObjectSymbolFlags function does not require a well-formed object, so we have to propagate the error here. llvm-svn: 338975
Diffstat (limited to 'llvm/lib/ExecutionEngine/Orc/Layer.cpp')
-rw-r--r--llvm/lib/ExecutionEngine/Orc/Layer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/Layer.cpp b/llvm/lib/ExecutionEngine/Orc/Layer.cpp
index 46b9e5738f6..8ba88b249ea 100644
--- a/llvm/lib/ExecutionEngine/Orc/Layer.cpp
+++ b/llvm/lib/ExecutionEngine/Orc/Layer.cpp
@@ -116,8 +116,10 @@ Expected<SymbolFlagsMap> getObjectSymbolFlags(ExecutionSession &ES,
for (auto &Sym : (*Obj)->symbols()) {
if (!(Sym.getFlags() & object::BasicSymbolRef::SF_Undefined) &&
(Sym.getFlags() & object::BasicSymbolRef::SF_Exported)) {
- auto InternedName =
- ES.getSymbolStringPool().intern(cantFail(Sym.getName()));
+ auto Name = Sym.getName();
+ if (!Name)
+ return Name.takeError();
+ auto InternedName = ES.getSymbolStringPool().intern(*Name);
auto SymFlags = JITSymbolFlags::fromObjectSymbol(Sym);
if (!SymFlags)
return SymFlags.takeError();
OpenPOWER on IntegriCloud