Changes in directory llvm/lib/Bytecode/Writer:
SlotCalculator.cpp updated: 1.74 -> 1.75
Writer.cpp updated: 1.129 -> 1.130
---
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: (+12 -11)
SlotCalculator.cpp | 6 +++---
Writer.cpp | 17 +++++++++--------
2 files changed, 12 insertions(+), 11 deletions(-)
Index: llvm/lib/Bytecode/Writer/SlotCalculator.cpp
diff -u llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.74
llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.75
--- llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.74 Wed Jun 7 17:20:03 2006
+++ llvm/lib/Bytecode/Writer/SlotCalculator.cpp Tue Nov 28 18:19:40 2006
@@ -31,8 +31,8 @@
using namespace llvm;
#if 0
-#include <iostream>
-#define SC_DEBUG(X) std::cerr << X
+#include "llvm/Support/Streams.h"
+#define SC_DEBUG(X) llvm_cerr << X
#else
#define SC_DEBUG(X)
#endif
@@ -800,7 +800,7 @@
// Used for debugging DefSlot=-1 assertion...
//if (Typ == Type::TypeTy)
- // cerr << "Inserting type '" << cast<Type>(D)->getDescription() << "'!\n";
+ // llvm_cerr << "Inserting type '"<<cast<Type>(D)->getDescription()
<<"'!\n";
if (Typ->isDerivedType()) {
int ValSlot;
Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.129
llvm/lib/Bytecode/Writer/Writer.cpp:1.130
--- llvm/lib/Bytecode/Writer/Writer.cpp:1.129 Sun Nov 26 19:05:09 2006
+++ llvm/lib/Bytecode/Writer/Writer.cpp Tue Nov 28 18:19:40 2006
@@ -29,6 +29,7 @@
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "llvm/Support/Compressor.h"
#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/Streams.h"
#include "llvm/System/Program.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/Statistic.h"
@@ -275,7 +276,7 @@
break;
default:
- std::cerr << __FILE__ << ":" << __LINE__ << ": Don't know how to serialize"
+ llvm_cerr << __FILE__ << ":" << __LINE__ << ": Don't know how to serialize"
<< " Type '" << T->getDescription() << "'\n";
break;
}
@@ -384,7 +385,7 @@
case Type::VoidTyID:
case Type::LabelTyID:
default:
- std::cerr << __FILE__ << ":" << __LINE__ << ": Don't know how to serialize"
+ llvm_cerr << __FILE__ << ":" << __LINE__ << ": Don't know how to serialize"
<< " type '" << *CPV->getType() << "'\n";
break;
}
@@ -1225,13 +1226,13 @@
}
}
-void llvm::WriteBytecodeToFile(const Module *M, std::ostream &Out,
+void llvm::WriteBytecodeToFile(const Module *M, llvm_ostream &Out,
bool compress) {
assert(M && "You can't write a null module!!");
// Make sure that std::cout is put into binary mode for systems
// that care.
- if (&Out == std::cout)
+ if (Out == llvm_cout)
sys::Program::ChangeStdoutToBinary();
// Create a vector of unsigned char for the bytecode output. We
@@ -1264,21 +1265,21 @@
compressed_magic[2] = 'v';
compressed_magic[3] = 'c';
- Out.write(compressed_magic,4);
+ Out.stream()->write(compressed_magic,4);
// Compress everything after the magic number (which we altered)
Compressor::compressToStream(
(char*)(FirstByte+4), // Skip the magic number
Buffer.size()-4, // Skip the magic number
- Out // Where to write compressed data
+ *Out.stream() // Where to write compressed data
);
} else {
// We're not compressing, so just write the entire block.
- Out.write((char*)FirstByte, Buffer.size());
+ Out.stream()->write((char*)FirstByte, Buffer.size());
}
// make sure it hits disk now
- Out.flush();
+ Out.stream()->flush();
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
