projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
R600: Add ISA documents to the CompilerWriterInfo page
[oota-llvm.git]
/
tools
/
llvm-as
/
llvm-as.cpp
diff --git
a/tools/llvm-as/llvm-as.cpp
b/tools/llvm-as/llvm-as.cpp
index d39d6c8a31f60b57daadca078d06d0a676b4d806..d6f191961daa27967d12d0761bed13e2048ccd54 100644
(file)
--- a/
tools/llvm-as/llvm-as.cpp
+++ b/
tools/llvm-as/llvm-as.cpp
@@
-15,18
+15,18
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
-#include "llvm/Assembly/Parser.h"
+#include "llvm/IR/LLVMContext.h"
#include "llvm/Analysis/Verifier.h"
#include "llvm/Analysis/Verifier.h"
+#include "llvm/Assembly/Parser.h"
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/IR/Module.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/Signals.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/SystemUtils.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/Support/SystemUtils.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/System/Signals.h"
+#include "llvm/Support/ToolOutputFile.h"
#include <memory>
using namespace llvm;
#include <memory>
using namespace llvm;
@@
-68,22
+68,20
@@
static void WriteOutputFile(const Module *M) {
}
}
}
}
- // Make sure that the Out file gets unlinked from the disk if we get a
- // SIGINT.
- if (OutputFilename != "-")
- sys::RemoveFileOnSignal(sys::Path(OutputFilename));
-
std::string ErrorInfo;
std::string ErrorInfo;
-
std::auto_ptr<raw_ostream
> Out
- (new
raw_fd_ostream
(OutputFilename.c_str(), ErrorInfo,
- raw_fd_ostream::F_Binary));
+
OwningPtr<tool_output_file
> Out
+ (new
tool_output_file
(OutputFilename.c_str(), ErrorInfo,
+
raw_fd_ostream::F_Binary));
if (!ErrorInfo.empty()) {
errs() << ErrorInfo << '\n';
exit(1);
}
if (!ErrorInfo.empty()) {
errs() << ErrorInfo << '\n';
exit(1);
}
- if (Force || !CheckBitcodeOutputToConsole(*Out, true))
- WriteBitcodeToFile(M, *Out);
+ if (Force || !CheckBitcodeOutputToConsole(Out->os(), true))
+ WriteBitcodeToFile(M, Out->os());
+
+ // Declare success.
+ Out->keep();
}
int main(int argc, char **argv) {
}
int main(int argc, char **argv) {
@@
-96,9
+94,9
@@
int main(int argc, char **argv) {
// Parse the file now...
SMDiagnostic Err;
// Parse the file now...
SMDiagnostic Err;
-
std::auto_p
tr<Module> M(ParseAssemblyFile(InputFilename, Err, Context));
+
OwningP
tr<Module> M(ParseAssemblyFile(InputFilename, Err, Context));
if (M.get() == 0) {
if (M.get() == 0) {
- Err.
P
rint(argv[0], errs());
+ Err.
p
rint(argv[0], errs());
return 1;
}
return 1;
}