[llvm-commits] CVS: llvm/tools/llvm-extract/llvm-extract.cpp
Bill Wendling
isanbard at gmail.com
Tue Nov 28 16:20:28 PST 2006
Changes in directory llvm/tools/llvm-extract:
llvm-extract.cpp updated: 1.30 -> 1.31
---
Log message:
Replacing std::iostreams with llvm iostreams. Some of these changes involve
adding a temporary wrapper around the ostream to make it friendly to
functions expecting an LLVM stream. This should be fixed in the future.
---
Diffs of the changes: (+9 -6)
llvm-extract.cpp | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
Index: llvm/tools/llvm-extract/llvm-extract.cpp
diff -u llvm/tools/llvm-extract/llvm-extract.cpp:1.30 llvm/tools/llvm-extract/llvm-extract.cpp:1.31
--- llvm/tools/llvm-extract/llvm-extract.cpp:1.30 Fri Jun 16 13:23:48 2006
+++ llvm/tools/llvm-extract/llvm-extract.cpp Tue Nov 28 18:19:40 2006
@@ -19,7 +19,9 @@
#include "llvm/Transforms/IPO.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Streams.h"
#include "llvm/System/Signals.h"
+#include <iostream>
#include <memory>
#include <fstream>
using namespace llvm;
@@ -51,14 +53,14 @@
std::auto_ptr<Module> M(ParseBytecodeFile(InputFilename));
if (M.get() == 0) {
- std::cerr << argv[0] << ": bytecode didn't read correctly.\n";
+ llvm_cerr << argv[0] << ": bytecode didn't read correctly.\n";
return 1;
}
// Figure out which function we should extract
Function *F = M.get()->getNamedFunction(ExtractFunc);
if (F == 0) {
- std::cerr << argv[0] << ": program doesn't contain function named '"
+ llvm_cerr << argv[0] << ": program doesn't contain function named '"
<< ExtractFunc << "'!\n";
return 1;
}
@@ -78,7 +80,7 @@
if (OutputFilename != "-") { // Not stdout?
if (!Force && std::ifstream(OutputFilename.c_str())) {
// If force is not specified, make sure not to overwrite a file!
- std::cerr << argv[0] << ": error opening '" << OutputFilename
+ llvm_cerr << argv[0] << ": error opening '" << OutputFilename
<< "': file exists!\n"
<< "Use -f command line argument to force output\n";
return 1;
@@ -91,16 +93,17 @@
Out = &std::cout;
}
- Passes.add(new WriteBytecodePass(Out)); // Write bytecode to file...
+ llvm_ostream L(*Out);
+ Passes.add(new WriteBytecodePass(&L)); // Write bytecode to file...
Passes.run(*M.get());
if (Out != &std::cout)
delete Out;
return 0;
} catch (const std::string& msg) {
- std::cerr << argv[0] << ": " << msg << "\n";
+ llvm_cerr << argv[0] << ": " << msg << "\n";
} catch (...) {
- std::cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
+ llvm_cerr << argv[0] << ": Unexpected unknown exception occurred.\n";
}
return 1;
}
More information about the llvm-commits
mailing list