diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-11-20 22:32:38 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-11-20 22:32:38 +0000 |
| commit | fc97102a80bfe0afaa25883a2aa6b5e1d7307d0a (patch) | |
| tree | b04c0affec9028e890b54b573be84c6b71627cc0 | |
| parent | e37f4b8e2e4fe3cbdf4a9ecd85af0bb5eaadc0b4 (diff) | |
Fix refactoro, clang-cc wasn't properly reporting errors when opening an output file failed.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@89502 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Frontend/CompilerInstance.cpp | 10 | ||||
| -rw-r--r-- | test/Frontend/output-failures.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index 0365761c84..872b7713f3 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -321,7 +321,7 @@ CompilerInstance::createOutputFile(llvm::StringRef OutputPath, &OutputPathName); if (!OS) { // FIXME: Don't fail this way. - llvm::errs() << "ERROR: " << Error << "\n"; + llvm::errs() << "error: " << Error << "\n"; ::exit(1); } @@ -353,16 +353,16 @@ CompilerInstance::createOutputFile(llvm::StringRef OutputPath, OutFile = "-"; } - llvm::raw_fd_ostream *OS = + llvm::OwningPtr<llvm::raw_fd_ostream> OS( new llvm::raw_fd_ostream(OutFile.c_str(), Error, - (Binary ? llvm::raw_fd_ostream::F_Binary : 0)); - if (!OS) + (Binary ? llvm::raw_fd_ostream::F_Binary : 0))); + if (!Error.empty()) return 0; if (ResultPathName) *ResultPathName = OutFile; - return OS; + return OS.take(); } // Initialization Utilities diff --git a/test/Frontend/output-failures.c b/test/Frontend/output-failures.c new file mode 100644 index 0000000000..a8687c754a --- /dev/null +++ b/test/Frontend/output-failures.c @@ -0,0 +1,4 @@ +// RUN: not clang-cc -emit-llvm -o %S/doesnotexist/somename %s 2> %t +// RUN: FileCheck -check-prefix=OUTPUTFAIL -input-file=%t %s + +// OUTPUTFAIL: Error opening output file '{{.*}}doesnotexist{{.*}}' |