maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove uses of std::ostream from libAnalysis. 

llvm-svn: 74136
This commit is contained in:
Ted Kremenek 2009-06-24 23:06:47 +00:00
parent dbc98ae4c2
commit 799bb6e178
15 changed files with 51 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Analysis/PathSensitive/ConstraintManager.h
View File

@ -45,7 +45,7 @@ public:
virtual const GRState *RemoveDeadBindings(const GRState *state,
SymbolReaper& SymReaper) = 0;
virtual void print(const GRState *state, std::ostream& Out,
virtual void print(const GRState *state, llvm::raw_ostream& Out,
const char* nl, const char *sep) = 0;
virtual void EndPath(const GRState *state) {}

8
clang/include/clang/Analysis/PathSensitive/GRState.h
View File

@ -34,7 +34,7 @@
#include "llvm/ADT/DenseSet.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Streams.h"
#include "llvm/Support/raw_ostream.h"
#include <functional>
@ -326,17 +326,17 @@ public:
class Printer {
public:
virtual ~Printer() {}
virtual void Print(std::ostream& Out, const GRState* state,
virtual void Print(llvm::raw_ostream& Out, const GRState* state,
const char* nl, const char* sep) = 0;
};
// Pretty-printing.
void print(std::ostream& Out, const char *nl = "\n",
void print(llvm::raw_ostream& Out, const char *nl = "\n",
const char *sep = "") const;
void printStdErr() const;
void printDOT(std::ostream& Out) const;
void printDOT(llvm::raw_ostream& Out) const;
// Tags used for the Generic Data Map.
struct NullDerefTag {

1
clang/include/clang/Analysis/PathSensitive/SVals.h
View File

@ -111,7 +111,6 @@ public:
/// return that expression. Otherwise return NULL.
const SymExpr *getAsSymbolicExpression() const;
void print(std::ostream& OS) const;
void print(llvm::raw_ostream& OS) const;
void printStdErr() const;

3
clang/include/clang/Analysis/PathSensitive/Store.h
View File

@ -21,7 +21,6 @@
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include <iosfwd>
namespace clang {
@ -171,7 +170,7 @@ public:
return state;
}
virtual void print(Store store, std::ostream& Out,
virtual void print(Store store, llvm::raw_ostream& Out,
const char* nl, const char *sep) = 0;
class BindingsHandler {

5
clang/include/clang/Analysis/PathSensitive/SymbolManager.h
View File

@ -328,9 +328,4 @@ namespace llvm {
llvm::raw_ostream& operator<<(llvm::raw_ostream& Out,
const clang::SymExpr *SE);
}
namespace std {
std::ostream& operator<<(std::ostream& Out,
const clang::SymExpr *SE);
}
#endif

12
clang/lib/Analysis/BasicConstraintManager.cpp
View File

@ -83,7 +83,7 @@ public:
const GRState* RemoveDeadBindings(const GRState* state, SymbolReaper& SymReaper);
void print(const GRState* state, std::ostream& Out,
void print(const GRState* state, llvm::raw_ostream& Out,
const char* nl, const char *sep);
};
@ -280,7 +280,7 @@ BasicConstraintManager::RemoveDeadBindings(const GRState* state,
return state->set<ConstNotEq>(CNE);
}
void BasicConstraintManager::print(const GRState* state, std::ostream& Out,
void BasicConstraintManager::print(const GRState* state, llvm::raw_ostream& Out,
const char* nl, const char *sep) {
// Print equality constraints.
@ -288,12 +288,8 @@ void BasicConstraintManager::print(const GRState* state, std::ostream& Out,
if (!CE.isEmpty()) {
Out << nl << sep << "'==' constraints:";
for (ConstEqTy::iterator I = CE.begin(), E = CE.end(); I!=E; ++I) {
Out << nl << " $" << I.getKey();
llvm::raw_os_ostream OS(Out);
OS << " : " << *I.getData();
}
for (ConstEqTy::iterator I = CE.begin(), E = CE.end(); I!=E; ++I)
Out << nl << " $" << I.getKey() << " : " << *I.getData();
}
// Print != constraints.

12
clang/lib/Analysis/BasicStore.cpp
View File

@ -112,7 +112,8 @@ public:
return BindingsTy(static_cast<const BindingsTy::TreeTy*>(store));
}
void print(Store store, std::ostream& Out, const char* nl, const char *sep);
void print(Store store, llvm::raw_ostream& Out, const char* nl,
const char *sep);
private:
ASTContext& getContext() { return StateMgr.getContext(); }
@ -602,18 +603,19 @@ Store BasicStoreManager::BindDeclInternal(Store store, const VarDecl* VD,
return store;
}
void BasicStoreManager::print(Store store, std::ostream& O,
void BasicStoreManager::print(Store store, llvm::raw_ostream& Out,
const char* nl, const char *sep) {
llvm::raw_os_ostream Out(O);
BindingsTy B = GetBindings(store);
Out << "Variables:" << nl;
bool isFirst = true;
for (BindingsTy::iterator I=B.begin(), E=B.end(); I != E; ++I) {
if (isFirst) isFirst = false;
else Out << nl;
if (isFirst)
isFirst = false;
else
Out << nl;
Out << ' ' << I.getKey() << " : ";
I.getData().print(Out);

15
clang/lib/Analysis/CFRefCount.cpp
View File

@ -30,7 +30,6 @@
#include "llvm/ADT/StringExtras.h"
#include "llvm/Support/Compiler.h"
#include "llvm/ADT/STLExtras.h"
#include <ostream>
#include <stdarg.h>
using namespace clang;
@ -1674,10 +1673,10 @@ public:
ID.Add(T);
}
void print(std::ostream& Out) const;
void print(llvm::raw_ostream& Out) const;
};
void RefVal::print(std::ostream& Out) const {
void RefVal::print(llvm::raw_ostream& Out) const {
if (!T.isNull())
Out << "Tracked Type:" << T.getAsString() << '\n';
@ -1831,7 +1830,7 @@ class VISIBILITY_HIDDEN CFRefCount : public GRSimpleVals {
public:
class BindingsPrinter : public GRState::Printer {
public:
virtual void Print(std::ostream& Out, const GRState* state,
virtual void Print(llvm::raw_ostream& Out, const GRState* state,
const char* nl, const char* sep);
};
@ -1959,7 +1958,8 @@ public:
} // end anonymous namespace
static void PrintPool(std::ostream &Out, SymbolRef Sym, const GRState *state) {
static void PrintPool(llvm::raw_ostream &Out, SymbolRef Sym,
const GRState *state) {
Out << ' ';
if (Sym)
Out << Sym->getSymbolID();
@ -1975,10 +1975,9 @@ static void PrintPool(std::ostream &Out, SymbolRef Sym, const GRState *state) {
Out << '}';
}
void CFRefCount::BindingsPrinter::Print(std::ostream& Out, const GRState* state,
void CFRefCount::BindingsPrinter::Print(llvm::raw_ostream& Out,
const GRState* state,
const char* nl, const char* sep) {
RefBindings B = state->get<RefBindings>();

5
clang/lib/Analysis/CheckObjCUnusedIVars.cpp
View File

@ -20,7 +20,6 @@
#include "clang/AST/Expr.h"
#include "clang/AST/DeclObjC.h"
#include "clang/Basic/LangOptions.h"
#include <sstream>
using namespace clang;
@ -97,8 +96,8 @@ void clang::CheckObjCUnusedIvar(ObjCImplementationDecl* D, BugReporter& BR) {
// Find ivars that are unused.
for (IvarUsageMap::iterator I = M.begin(), E = M.end(); I!=E; ++I)
if (I->second == Unused) {
std::ostringstream os;
std::string sbuf;
llvm::raw_string_ostream os(sbuf);
os << "Instance variable '" << I->first->getNameAsString()
<< "' in class '" << ID->getNameAsString()
<< "' is never used by the methods in its @implementation "

20
clang/lib/Analysis/GRExprEngine.cpp
View File

@ -3158,7 +3158,9 @@ struct VISIBILITY_HIDDEN DOTGraphTraits<GRExprEngine::NodeTy*> :
static std::string getNodeLabel(const GRExprEngine::NodeTy* N, void*,
bool ShortNames) {
std::ostringstream Out;
std::string sbuf;
llvm::raw_string_ostream Out(sbuf);
// Program Location.
ProgramPoint Loc = N->getLocation();
@ -3180,9 +3182,7 @@ struct VISIBILITY_HIDDEN DOTGraphTraits<GRExprEngine::NodeTy*> :
SourceLocation SLoc = S->getLocStart();
Out << S->getStmtClassName() << ' ' << (void*) S << ' ';
llvm::raw_os_ostream OutS(Out);
S->printPretty(OutS);
OutS.flush();
S->printPretty(Out);
if (SLoc.isFileID()) {
Out << "\\lline="
@ -3236,10 +3236,7 @@ struct VISIBILITY_HIDDEN DOTGraphTraits<GRExprEngine::NodeTy*> :
SourceLocation SLoc = T->getLocStart();
Out << "\\|Terminator: ";
llvm::raw_os_ostream OutS(Out);
E.getSrc()->printTerminator(OutS);
OutS.flush();
E.getSrc()->printTerminator(Out);
if (SLoc.isFileID()) {
Out << "\\lline="
@ -3254,14 +3251,11 @@ struct VISIBILITY_HIDDEN DOTGraphTraits<GRExprEngine::NodeTy*> :
if (Label) {
if (CaseStmt* C = dyn_cast<CaseStmt>(Label)) {
Out << "\\lcase ";
llvm::raw_os_ostream OutS(Out);
C->getLHS()->printPretty(OutS);
OutS.flush();
C->getLHS()->printPretty(Out);
if (Stmt* RHS = C->getRHS()) {
Out << " .. ";
RHS->printPretty(OutS);
OutS.flush();
RHS->printPretty(Out);
}
Out << ":";

20
clang/lib/Analysis/GRState.cpp
View File

@ -1,4 +1,4 @@
//= GRState*cpp - Path-Sens. "State" for tracking valuues -----*- C++ -*--=//
//= GRState.cpp - Path-Sensitive "State" for tracking values -----*- C++ -*--=//
//
// The LLVM Compiler Infrastructure
//
@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
//
// This file defines SymbolRef, ExprBindKey, and GRState*
// This file implements GRState and GRStateManager.
//
//===----------------------------------------------------------------------===//
@ -20,6 +20,7 @@
using namespace clang;
// Give the vtable for ConstraintManager somewhere to live.
// FIXME: Move this elsewhere.
ConstraintManager::~ConstraintManager() {}
GRStateManager::~GRStateManager() {
@ -117,7 +118,8 @@ const GRState* GRState::makeWithStore(Store store) const {
// State pretty-printing.
//===----------------------------------------------------------------------===//
void GRState::print(std::ostream& Out, const char* nl, const char* sep) const {
void GRState::print(llvm::raw_ostream& Out, const char* nl,
const char* sep) const {
// Print the store.
Mgr->getStoreManager().print(getStore(), Out, nl, sep);
@ -133,9 +135,7 @@ void GRState::print(std::ostream& Out, const char* nl, const char* sep) const {
else { Out << nl; }
Out << " (" << (void*) I.getKey() << ") ";
llvm::raw_os_ostream OutS(Out);
I.getKey()->printPretty(OutS);
OutS.flush();
I.getKey()->printPretty(Out);
Out << " : ";
I.getData().print(Out);
}
@ -152,9 +152,7 @@ void GRState::print(std::ostream& Out, const char* nl, const char* sep) const {
else { Out << nl; }
Out << " (" << (void*) I.getKey() << ") ";
llvm::raw_os_ostream OutS(Out);
I.getKey()->printPretty(OutS);
OutS.flush();
I.getKey()->printPretty(Out);
Out << " : ";
I.getData().print(Out);
}
@ -168,12 +166,12 @@ void GRState::print(std::ostream& Out, const char* nl, const char* sep) const {
}
}
void GRState::printDOT(std::ostream& Out) const {
void GRState::printDOT(llvm::raw_ostream& Out) const {
print(Out, "\\l", "\\|");
}
void GRState::printStdErr() const {
print(*llvm::cerr);
print(llvm::errs());
}
//===----------------------------------------------------------------------===//

8
clang/lib/Analysis/RangeConstraintManager.cpp
View File

@ -200,7 +200,7 @@ public:
return newRanges;
}
void Print(std::ostream &os) const {
void print(llvm::raw_ostream &os) const {
bool isFirst = true;
os << "{ ";
for (iterator i = begin(), e = end(); i != e; ++i) {
@ -265,7 +265,7 @@ public:
const GRState* RemoveDeadBindings(const GRState* St, SymbolReaper& SymReaper);
void print(const GRState* St, std::ostream& Out,
void print(const GRState* St, llvm::raw_ostream& Out,
const char* nl, const char *sep);
private:
@ -341,7 +341,7 @@ AssumeX(GE)
// Pretty-printing.
//===------------------------------------------------------------------------===/
void RangeConstraintManager::print(const GRState* St, std::ostream& Out,
void RangeConstraintManager::print(const GRState* St, llvm::raw_ostream& Out,
const char* nl, const char *sep) {
ConstraintRangeTy Ranges = St->get<ConstraintRange>();
@ -353,6 +353,6 @@ void RangeConstraintManager::print(const GRState* St, std::ostream& Out,
for (ConstraintRangeTy::iterator I=Ranges.begin(), E=Ranges.end(); I!=E; ++I){
Out << nl << ' ' << I.getKey() << " : ";
I.getData().Print(Out);
I.getData().print(Out);
}
}

14
clang/lib/Analysis/RegionStore.cpp
View File

@ -238,10 +238,8 @@ public:
CastResult CastRegion(const GRState *state, const MemRegion* R,
QualType CastToTy);
SVal EvalBinOp(const GRState *state, BinaryOperator::Opcode Op,Loc L,NonLoc R);
SVal EvalBinOp(const GRState *state, BinaryOperator::Opcode Op,Loc L,
NonLoc R);
Store getInitialStore() { return RBFactory.GetEmptyMap().getRoot(); }
@ -260,8 +258,6 @@ public:
return SelfRegion;
}
//===-------------------------------------------------------------------===//
// Binding values to regions.
@ -352,7 +348,8 @@ public:
return RegionBindingsTy(static_cast<const RegionBindingsTy::TreeTy*>(store));
}
void print(Store store, std::ostream& Out, const char* nl, const char *sep);
void print(Store store, llvm::raw_ostream& Out, const char* nl,
const char *sep);
void iterBindings(Store store, BindingsHandler& f) {
// FIXME: Implement.
@ -1423,9 +1420,8 @@ Store RegionStoreManager::RemoveDeadBindings(const GRState *state, Stmt* Loc,
// Utility methods.
//===----------------------------------------------------------------------===//
void RegionStoreManager::print(Store store, std::ostream& Out,
void RegionStoreManager::print(Store store, llvm::raw_ostream& OS,
const char* nl, const char *sep) {
llvm::raw_os_ostream OS(Out);
RegionBindingsTy B = GetRegionBindings(store);
OS << "Store:" << nl;

5
clang/lib/Analysis/SVals.cpp
View File

@ -242,11 +242,6 @@ SVal loc::ConcreteInt::EvalBinOp(BasicValueFactory& BasicVals,
void SVal::printStdErr() const { print(llvm::errs()); }
void SVal::print(std::ostream& Out) const {
llvm::raw_os_ostream out(Out);
print(out);
}
void SVal::print(llvm::raw_ostream& Out) const {
switch (getBaseKind()) {

6
clang/lib/Analysis/SymbolManager.cpp
View File

@ -85,12 +85,6 @@ llvm::raw_ostream& llvm::operator<<(llvm::raw_ostream& os, const SymExpr *SE) {
return os;
}
std::ostream& std::operator<<(std::ostream& os, const SymExpr *SE) {
llvm::raw_os_ostream O(os);
print(O, SE);
return os;
}
const SymbolRegionValue*
SymbolManager::getRegionValueSymbol(const MemRegion* R, QualType T) {
llvm::FoldingSetNodeID profile;