Changes from 3.7 merge to files not in upstream

tools/pnacl-freeze/pnacl-freeze.cpp

Index: tools/pnacl-freeze/pnacl-freeze.cpp
diff --git a/tools/pnacl-freeze/pnacl-freeze.cpp b/tools/pnacl-freeze/pnacl-freeze.cpp
index 3899c8e1c09238af7b8bd4665987f7d6327acacb..ea56ec3dbe092348d8295b1cec047d4690df2f2d 100644
--- a/tools/pnacl-freeze/pnacl-freeze.cpp
+++ b/tools/pnacl-freeze/pnacl-freeze.cpp
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
   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);
@@ -73,13 +73,10 @@ int main(int argc, char **argv) {
       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.