Changes from 3.7 merge to files not in upstream

tools/pnacl-freeze/pnacl-freeze.cpp

 /* Copyright 2013 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 //===-- pnacl-freeze.cpp - The low-level NaCl bitcode freezer     --------===//
 //
 //===----------------------------------------------------------------------===//
 //
 // Generates NaCl pexe wire format.
@@ skipping 43 matching lines @@
   // Print a stack trace if we signal out.
   sys::PrintStackTraceOnErrorSignal();
   PrettyStackTraceProgram X(argc, argv);
 
   LLVMContext &Context = getGlobalContext();
   llvm_shutdown_obj Y;  // Call llvm_shutdown() on exit.
 
   cl::ParseCommandLineOptions(argc, argv, "Generates NaCl pexe wire format\n");
 
   std::string ErrorMessage;
-  std::auto_ptr<Module> M;
+  std::unique_ptr<Module> M;
 
   // Use the bitcode streaming interface
   DataStreamer *streamer = getDataFileStreamer(InputFilename, &ErrorMessage);
   std::unique_ptr<StreamingMemoryObject> Buffer(
       new StreamingMemoryObjectImpl(streamer));
   if (streamer) {
     std::string DisplayFilename;
     if (InputFilename == "-")
       DisplayFilename = "<stdin>";
     else
       DisplayFilename = InputFilename;
-    M.reset(getStreamedBitcodeModule(DisplayFilename, Buffer.release(), Context,
-                                     &ErrorMessage));
-    if (M.get())
-      if (std::error_code EC = M->materializeAllPermanently()) {
-        ErrorMessage = EC.message();
-        M.reset();
-      }
+    ErrorOr<std::unique_ptr<Module>> MOrErr =
+        getStreamedBitcodeModule(DisplayFilename, Buffer.release(), Context);
+    M = std::move(*MOrErr);
+    M->materializeAllPermanently();
   }
 
   if (!M.get()) {

[jvoung (off chromium), 2015/05/26 20:39:45]

could be the else { } from if (streamer), since it's checking the ErrorMessage
from getDataFileStreamer which is correlated with streamer. Otherwise, at this
point MOrErr is assumed to not be an Err because it's deref'ed as part of line
78?

[Derek Schuff, 2015/05/26 22:01:33]

Done.

     errs() << argv[0] << ": ";
     if (ErrorMessage.size())
       errs() << ErrorMessage << "\n";
     else
       errs() << "bitcode didn't read correctly.\n";
     return 1;
   }
 
   WriteOutputFile(M.get());
   return 0;
 }