X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FIR%2FModule.cpp;h=ac578d6dba0fa3949cffbddb3d543aae492c96df;hb=18a1b59aaf65be0d0581a040db9a2fedc7d32bf1;hp=0685c1a206dd060d9ea4348e6602c6cbebfbf9fe;hpb=b223cec87ddf00817049bc7307a9a5969b9095d1;p=oota-llvm.git

diff --git a/lib/IR/Module.cpp b/lib/IR/Module.cpp
index 0685c1a206d..ac578d6dba0 100644
--- a/lib/IR/Module.cpp
+++ b/lib/IR/Module.cpp
@@ -394,10 +394,8 @@ std::error_code Module::materialize(GlobalValue *GV) {
 std::error_code Module::materializeAll() {
   if (!Materializer)
     return std::error_code();
-  if (std::error_code EC = Materializer->materializeModule())
-    return EC;
-  Materializer.reset();
-  return std::error_code();
+  std::unique_ptr<GVMaterializer> M = std::move(Materializer);
+  return M->materializeModule();
 }
 
 std::error_code Module::materializeMetadata() {