From: Dan Gohman <gohman@apple.com>
Date: Thu, 27 May 2010 20:19:47 +0000 (+0000)
Subject: When handling raw_ostream errors manually, use clear_error() so that
X-Git-Tag: android-x86-6.0-r1~1003^2~6093
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4b7416b75db2a4b80ccffe6e15c0d7b6996a8201;p=android-x86%2Fexternal-llvm.git

When handling raw_ostream errors manually, use clear_error() so that
raw_ostream doesn't try to do its own error handling.

Also, close the raw_ostream before checking for errors so that any
errors that occur during closing are caught by the manual check.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@104882 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/lto/LTOCodeGenerator.cpp b/tools/lto/LTOCodeGenerator.cpp
index 59e8405e7ec..c4d7e8abe72 100644
--- a/tools/lto/LTOCodeGenerator.cpp
+++ b/tools/lto/LTOCodeGenerator.cpp
@@ -152,10 +152,12 @@ bool LTOCodeGenerator::writeMergedModules(const char *path,
     
   // write bitcode to it
   WriteBitcodeToFile(_linker.getModule(), Out);
-  
+  Out.close();
+
   if (Out.has_error()) {
     errMsg = "could not write bitcode file: ";
     errMsg += path;
+    Out.clear_error();
     return true;
   }