[llvm-commits] [llvm] r79816 - in /llvm/trunk/lib/VMCore: Constants.cpp Verifier.cpp
Chris Lattner
sabre at nondot.org
Sat Aug 22 21:02:03 PDT 2009
Author: lattner
Date: Sat Aug 22 23:02:03 2009
New Revision: 79816
URL: http://llvm.org/viewvc/llvm-project?rev=79816&view=rev
Log:
switch a couple things off std::ostream
Modified:
llvm/trunk/lib/VMCore/Constants.cpp
llvm/trunk/lib/VMCore/Verifier.cpp
Modified: llvm/trunk/lib/VMCore/Constants.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Constants.cpp?rev=79816&r1=79815&r2=79816&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Constants.cpp (original)
+++ llvm/trunk/lib/VMCore/Constants.cpp Sat Aug 22 23:02:03 2009
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "LLVMContextImpl.h"
#include "llvm/Constants.h"
+#include "LLVMContextImpl.h"
#include "ConstantFold.h"
#include "llvm/DerivedTypes.h"
#include "llvm/GlobalValue.h"
@@ -27,6 +27,7 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/raw_ostream.h"
#include "llvm/System/Mutex.h"
#include "llvm/System/RWMutex.h"
#include "llvm/System/Threading.h"
@@ -110,10 +111,11 @@
while (!use_empty()) {
Value *V = use_back();
#ifndef NDEBUG // Only in -g mode...
- if (!isa<Constant>(V))
- DOUT << "While deleting: " << *this
- << "\n\nUse still stuck around after Def is destroyed: "
- << *V << "\n\n";
+ if (!isa<Constant>(V)) {
+ errs() << "While deleting: " << *this
+ << "\n\nUse still stuck around after Def is destroyed: "
+ << *V << "\n\n";
+ }
#endif
assert(isa<Constant>(V) && "References remain to Constant being destroyed");
Constant *CV = cast<Constant>(V);
Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=79816&r1=79815&r2=79816&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Sat Aug 22 23:02:03 2009
@@ -65,7 +65,6 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
-#include <sstream>
#include <cstdarg>
using namespace llvm;
@@ -116,7 +115,9 @@
// What to do if verification fails.
Module *Mod; // Module we are verifying right now
DominatorTree *DT; // Dominator Tree, caution can be null!
- std::stringstream msgs; // A stringstream to collect messages
+
+ std::string Messages;
+ raw_string_ostream MessagesStr;
/// InstInThisBlock - when verifying a basic block, keep track of all of the
/// instructions we have seen so far. This allows us to do efficient
@@ -127,20 +128,20 @@
Verifier()
: FunctionPass(&ID),
Broken(false), RealPass(true), action(AbortProcessAction),
- DT(0), msgs( std::ios::app | std::ios::out ) {}
+ DT(0), MessagesStr(Messages) {}
explicit Verifier(VerifierFailureAction ctn)
: FunctionPass(&ID),
Broken(false), RealPass(true), action(ctn), DT(0),
- msgs( std::ios::app | std::ios::out ) {}
+ MessagesStr(Messages) {}
explicit Verifier(bool AB)
: FunctionPass(&ID),
Broken(false), RealPass(true),
action( AB ? AbortProcessAction : PrintMessageAction), DT(0),
- msgs( std::ios::app | std::ios::out ) {}
+ MessagesStr(Messages) {}
explicit Verifier(DominatorTree &dt)
: FunctionPass(&ID),
Broken(false), RealPass(false), action(PrintMessageAction),
- DT(&dt), msgs( std::ios::app | std::ios::out ) {}
+ DT(&dt), MessagesStr(Messages) {}
bool doInitialization(Module &M) {
@@ -206,20 +207,20 @@
///
bool abortIfBroken() {
if (!Broken) return false;
- msgs << "Broken module found, ";
+ MessagesStr << "Broken module found, ";
switch (action) {
default: llvm_unreachable("Unknown action");
case AbortProcessAction:
- msgs << "compilation aborted!\n";
- cerr << msgs.str();
+ MessagesStr << "compilation aborted!\n";
+ errs() << MessagesStr.str();
// Client should choose different reaction if abort is not desired
abort();
case PrintMessageAction:
- msgs << "verification continues.\n";
- cerr << msgs.str();
+ MessagesStr << "verification continues.\n";
+ errs() << MessagesStr.str();
return false;
case ReturnStatusAction:
- msgs << "compilation terminated.\n";
+ MessagesStr << "compilation terminated.\n";
return true;
}
}
@@ -286,18 +287,17 @@
void WriteValue(const Value *V) {
if (!V) return;
if (isa<Instruction>(V)) {
- msgs << *V;
+ MessagesStr << *V;
} else {
- WriteAsOperand(msgs, V, true, Mod);
- msgs << "\n";
+ WriteAsOperand(MessagesStr, V, true, Mod);
+ MessagesStr << "\n";
}
}
void WriteType(const Type *T) {
if (!T) return;
- raw_os_ostream RO(msgs);
- RO << ' ';
- WriteTypeSymbolic(RO, T, Mod);
+ MessagesStr << ' ';
+ WriteTypeSymbolic(MessagesStr, T, Mod);
}
@@ -307,7 +307,7 @@
void CheckFailed(const Twine &Message,
const Value *V1 = 0, const Value *V2 = 0,
const Value *V3 = 0, const Value *V4 = 0) {
- msgs << Message.str() << "\n";
+ MessagesStr << Message.str() << "\n";
WriteValue(V1);
WriteValue(V2);
WriteValue(V3);
@@ -317,7 +317,7 @@
void CheckFailed(const Twine &Message, const Value* V1,
const Type* T2, const Value* V3 = 0) {
- msgs << Message.str() << "\n";
+ MessagesStr << Message.str() << "\n";
WriteValue(V1);
WriteType(T2);
WriteValue(V3);
@@ -1764,8 +1764,6 @@
PM.run(const_cast<Module&>(M));
if (ErrorInfo && V->Broken)
- *ErrorInfo = V->msgs.str();
+ *ErrorInfo = V->MessagesStr.str();
return V->Broken;
}
-
-// vim: sw=2
More information about the llvm-commits
mailing list