summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-dis
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-01-14 23:51:27 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-01-14 23:51:27 +0000
commite9fab9b0778b2df4480d9cd7fa0d2a3ac4c8bfac (patch)
treeca2481c9748e4a5b830a9eed092a0fe7a49315b7 /llvm/tools/llvm-dis
parent4dcc4637b510002e85efb7cff5420597064c9376 (diff)
downloadbcm5719-llvm-e9fab9b0778b2df4480d9cd7fa0d2a3ac4c8bfac.tar.gz
bcm5719-llvm-e9fab9b0778b2df4480d9cd7fa0d2a3ac4c8bfac.zip
Return an error_code from materializeAllPermanently.
llvm-svn: 199275
Diffstat (limited to 'llvm/tools/llvm-dis')
-rw-r--r--llvm/tools/llvm-dis/llvm-dis.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp
index 6d471efcc0f..9fb056510c0 100644
--- a/llvm/tools/llvm-dis/llvm-dis.cpp
+++ b/llvm/tools/llvm-dis/llvm-dis.cpp
@@ -135,8 +135,11 @@ int main(int argc, char **argv) {
DisplayFilename = InputFilename;
M.reset(getStreamedBitcodeModule(DisplayFilename, streamer, Context,
&ErrorMessage));
- if(M.get() != 0 && M->MaterializeAllPermanently(&ErrorMessage)) {
- M.reset();
+ if(M.get() != 0) {
+ if (error_code EC = M->materializeAllPermanently()) {
+ ErrorMessage = EC.message();
+ M.reset();
+ }
}
}
OpenPOWER on IntegriCloud