diff options
author | Bill Wendling <isanbard@gmail.com> | 2006-12-17 05:15:13 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2006-12-17 05:15:13 +0000 |
commit | 5c7e326585f3a543388ba871c3425f7664cd9143 (patch) | |
tree | 85de3d1ef8b725fb5db8a5e36c5d312da657cab6 /include | |
parent | 89b0d995d26d9e70b9c8d7fab8b99f1e89ac11bb (diff) | |
download | llvm-5c7e326585f3a543388ba871c3425f7664cd9143.tar.gz llvm-5c7e326585f3a543388ba871c3425f7664cd9143.tar.bz2 llvm-5c7e326585f3a543388ba871c3425f7664cd9143.tar.xz |
Added an automatic cast to "std::ostream*" etc. from OStream. We then can
rework the hacks that had us passing OStream in. We pass in std::ostream*
instead, check for null, and then dispatch to the correct print() method.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32636 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
35 files changed, 95 insertions, 128 deletions
diff --git a/include/llvm/ADT/BitSetVector.h b/include/llvm/ADT/BitSetVector.h index 5d1fc86c3a..21d3cc9e7b 100644 --- a/include/llvm/ADT/BitSetVector.h +++ b/include/llvm/ADT/BitSetVector.h @@ -27,7 +27,6 @@ #include "llvm/Support/Streams.h" #include <bitset> -#include <vector> #include <functional> namespace llvm { @@ -173,10 +172,8 @@ public: /// /// Printing and debugging support /// - void print(OStream &O) const { - if (O.stream()) print(*O.stream()); - } void print(std::ostream &O) const; + void print(std::ostream *O) const { if (O) print(*O); } void dump() const { print(cerr); } public: @@ -247,24 +244,18 @@ public: }; -inline void BitSetVector::print(std::ostream& O) const +inline void BitSetVector::print(llvm_ostream& O) const { for (std::vector<bitword>::const_iterator I=bitsetVec.begin(), E=bitsetVec.end(); I != E; ++I) O << "<" << (*I) << ">" << (I+1 == E? "\n" : ", "); } -inline OStream& operator<< (OStream& O, const BitSetVector& bset) { - bset.print(O); - return O; -} -inline std::ostream& operator<< (std::ostream& O, const BitSetVector& bset) -{ +inline std::ostream& operator<<(std::ostream& O, const BitSetVector& bset) { bset.print(O); return O; } - /// /// Optimized versions of fundamental comparison operations /// diff --git a/include/llvm/Analysis/AliasSetTracker.h b/include/llvm/Analysis/AliasSetTracker.h index 5fcda16270..cd6450fac8 100644 --- a/include/llvm/Analysis/AliasSetTracker.h +++ b/include/llvm/Analysis/AliasSetTracker.h @@ -156,10 +156,8 @@ public: iterator end() const { return iterator(); } bool empty() const { return PtrList == 0; } - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } void dump() const; /// Define an iterator for alias sets... this is just a forward iterator. @@ -248,10 +246,6 @@ private: bool aliasesCallSite(CallSite CS, AliasAnalysis &AA) const; }; -inline OStream& operator<<(OStream &OS, const AliasSet &AS) { - AS.print(OS); - return OS; -} inline std::ostream& operator<<(std::ostream &OS, const AliasSet &AS) { AS.print(OS); return OS; @@ -361,10 +355,8 @@ public: iterator begin() { return AliasSets.begin(); } iterator end() { return AliasSets.end(); } - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } void dump() const; private: @@ -390,10 +382,6 @@ private: AliasSet *findAliasSetForCallSite(CallSite CS); }; -inline OStream& operator<<(OStream &OS, const AliasSetTracker &AST) { - AST.print(OS); - return OS; -} inline std::ostream& operator<<(std::ostream &OS, const AliasSetTracker &AST) { AST.print(OS); return OS; diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h index 1f737da53c..24effd8d49 100644 --- a/include/llvm/Analysis/CallGraph.h +++ b/include/llvm/Analysis/CallGraph.h @@ -152,10 +152,8 @@ public: /// void initialize(Module &M); - void print(OStream &o, const Module *M) const { - if (o.stream()) print(*o.stream(), M); - } virtual void print(std::ostream &o, const Module *M) const; + void print(std::ostream *o, const Module *M) const { if (o) print(*o, M); } void dump() const; // stub - dummy function, just ignore it @@ -201,10 +199,8 @@ public: /// dump - Print out this call graph node. /// void dump() const; - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } //===--------------------------------------------------------------------- // Methods to keep a call graph up to date with a function that has been diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h index 939300f8ac..f29ed8345d 100644 --- a/include/llvm/Analysis/Dominators.h +++ b/include/llvm/Analysis/Dominators.h @@ -144,6 +144,9 @@ public: /// print - Convert to human readable form /// virtual void print(std::ostream &OS, const Module* = 0) const; + void print(std::ostream *OS, const Module* M = 0) const { + if (OS) print(*OS, M); + } }; //===------------------------------------- @@ -234,6 +237,9 @@ public: /// print - Convert to human readable form /// virtual void print(std::ostream &OS, const Module* = 0) const; + void print(std::ostream *OS, const Module* M = 0) const { + if (OS) print(*OS, M); + } /// dominates - Return true if A dominates B. This performs the special /// checks necessary if A and B are in the same basic block. @@ -410,6 +416,9 @@ public: /// print - Convert to human readable form /// virtual void print(std::ostream &OS, const Module* = 0) const; + void print(std::ostream *OS, const Module* M = 0) const { + if (OS) print(*OS, M); + } }; //===------------------------------------- @@ -546,6 +555,9 @@ public: /// print - Convert to human readable form /// virtual void print(std::ostream &OS, const Module* = 0) const; + void print(std::ostream *OS, const Module* M = 0) const { + if (OS) print(*OS, M); + } protected: /// getNode - return the (Post)DominatorTree node for the specified basic /// block. This is the same as using operator[] on this class. @@ -635,6 +647,9 @@ public: /// print - Convert to human readable form /// virtual void print(std::ostream &OS, const Module* = 0) const; + void print(std::ostream *OS, const Module* M = 0) const { + if (OS) print(*OS, M); + } }; diff --git a/include/llvm/Analysis/FindUsedTypes.h b/include/llvm/Analysis/FindUsedTypes.h index fbf41de7cb..008e30c93e 100644 --- a/include/llvm/Analysis/FindUsedTypes.h +++ b/include/llvm/Analysis/FindUsedTypes.h @@ -34,6 +34,7 @@ public: /// symbol table from the module. /// void print(std::ostream &o, const Module *M) const; + void print(std::ostream *o, const Module *M) const { if (o) print(*o, M); } private: /// IncorporateType - Incorporate one type and all of its subtypes into the diff --git a/include/llvm/Analysis/Interval.h b/include/llvm/Analysis/Interval.h index b9e1d31e3a..bed815a665 100644 --- a/include/llvm/Analysis/Interval.h +++ b/include/llvm/Analysis/Interval.h @@ -99,6 +99,7 @@ public: /// print - Show contents in human readable format... void print(std::ostream &O) const; + void print(std::ostream *O) const { if (O) print(*O); } }; /// succ_begin/succ_end - define methods so that Intervals may be used diff --git a/include/llvm/Analysis/IntervalPartition.h b/include/llvm/Analysis/IntervalPartition.h index 1cc903cae1..bd998e81de 100644 --- a/include/llvm/Analysis/IntervalPartition.h +++ b/include/llvm/Analysis/IntervalPartition.h @@ -61,6 +61,9 @@ public: // print - Show contents in human readable format... virtual void print(std::ostream &O, const Module* = 0) const; + void print(std::ostream *O, const Module* M = 0) const { + if (O) print(*O, M); + } // getRootInterval() - Return the root interval that contains the starting // block of the function. diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h index 238a0f627d..62f19e3c29 100644 --- a/include/llvm/Analysis/LoopInfo.h +++ b/include/llvm/Analysis/LoopInfo.h @@ -217,10 +217,10 @@ public: /// the mapping in the LoopInfo class. void removeBlockFromLoop(BasicBlock *BB); - void print(OStream &O, unsigned Depth = 0) const { - if (O.stream()) print(*O.stream(), Depth); - } void print(std::ostream &O, unsigned Depth = 0) const; + void print(std::ostream *O, unsigned Depth = 0) const { + if (O) print(*O, Depth); + } void dump() const; private: friend class LoopInfo; @@ -283,10 +283,11 @@ public: virtual bool runOnFunction(Function &F); virtual void releaseMemory(); - void print(OStream &O, const Module* = 0) const { - if (O.stream()) print(*O.stream()); - } + void print(std::ostream &O, const Module* = 0) const; + void print(std::ostream *O, const Module* M = 0) const { + if (O) print(*O, M); + } virtual void getAnalysisUsage(AnalysisUsage &AU) const; diff --git a/include/llvm/Analysis/ScalarEvolution.h b/include/llvm/Analysis/ScalarEvolution.h index 4eb0bb33b2..4aac284ee0 100644 --- a/include/llvm/Analysis/ScalarEvolution.h +++ b/include/llvm/Analysis/ScalarEvolution.h @@ -97,20 +97,14 @@ namespace llvm { /// print - Print out the internal representation of this scalar to the /// specified stream. This should really only be used for debugging /// purposes. - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } virtual void print(std::ostream &OS) const = 0; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// dump - This method is used for debugging. /// void dump() const; }; - inline OStream &operator<<(OStream &OS, const SCEV &S) { - S.print(OS); - return OS; - } inline std::ostream &operator<<(std::ostream &OS, const SCEV &S) { S.print(OS); return OS; @@ -128,10 +122,8 @@ namespace llvm { virtual bool isLoopInvariant(const Loop *L) const; virtual const Type *getType() const; virtual bool hasComputableLoopEvolution(const Loop *L) const; - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } virtual SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym, const SCEVHandle &Conc) const; @@ -242,10 +234,10 @@ namespace llvm { virtual bool runOnFunction(Function &F); virtual void releaseMemory(); virtual void getAnalysisUsage(AnalysisUsage &AU) const; - void print(OStream &OS, const Module* = 0) const { - if (OS.stream()) print(*OS.stream()); - } virtual void print(std::ostream &OS, const Module* = 0) const; + void print(std::ostream *OS, const Module* M = 0) const { + if (OS) print(*OS, M); + } }; } diff --git a/include/llvm/Analysis/ScalarEvolutionExpressions.h b/include/llvm/Analysis/ScalarEvolutionExpressions.h index ba1b6d4fec..c261dfc8e5 100644 --- a/include/llvm/Analysis/ScalarEvolutionExpressions.h +++ b/include/llvm/Analysis/ScalarEvolutionExpressions.h @@ -62,6 +62,7 @@ namespace llvm { } virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const SCEVConstant *S) { return true; } @@ -108,6 +109,7 @@ namespace llvm { virtual ConstantRange getValueRange() const; virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const SCEVTruncateExpr *S) { return true; } @@ -154,6 +156,7 @@ namespace llvm { } virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const SCEVZeroExtendExpr *S) { return true; } @@ -218,6 +221,7 @@ namespace llvm { virtual const Type *getType() const { return getOperand(0)->getType(); } virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const SCEVCommutativeExpr *S) { return true; } @@ -332,6 +336,7 @@ namespace llvm { virtual const Type *getType() const; void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const SCEVSDivExpr *S) { return true; } @@ -428,6 +433,7 @@ namespace llvm { const SCEVHandle &Conc) const; virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const SCEVAddRecExpr *S) { return true; } @@ -472,6 +478,7 @@ namespace llvm { virtual const Type *getType() const; virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const SCEVUnknown *S) { return true; } diff --git a/include/llvm/Analysis/Trace.h b/include/llvm/Analysis/Trace.h index b26101d15c..65aa593c8d 100644 --- a/include/llvm/Analysis/Trace.h +++ b/include/llvm/Analysis/Trace.h @@ -106,7 +106,8 @@ public: /// print - Write trace to output stream. /// - void print (OStream &O) const; + void print (std::ostream &O) const; + void print (std::ostream *O) const { if (O) print(*O); } /// dump - Debugger convenience method; writes trace to standard error /// output stream. diff --git a/include/llvm/Argument.h b/include/llvm/Argument.h index 1751c21ce2..1d92066ce5 100644 --- a/include/llvm/Argument.h +++ b/include/llvm/Argument.h @@ -53,6 +53,9 @@ public: const Argument *getPrev() const { return Prev; } virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { + if (OS) print(*OS); + } /// classof - Methods for support type inquiry through isa, cast, and /// dyn_cast: diff --git a/include/llvm/BasicBlock.h b/include/llvm/BasicBlock.h index f15d2b46a9..0ca8eae1a3 100644 --- a/include/llvm/BasicBlock.h +++ b/include/llvm/BasicBlock.h @@ -152,6 +152,7 @@ public: InstListType &getInstList() { return InstList; } virtual void print(std::ostream &OS) const { print(OS, 0); } + void print(std::ostream *OS) const { if (OS) print(*OS); } void print(std::ostream &OS, AssemblyAnnotationWriter *AAW) const; /// Methods for support type inquiry through isa, cast, and dyn_cast: diff --git a/include/llvm/CodeGen/LinkAllCodegenComponents.h b/include/llvm/CodeGen/LinkAllCodegenComponents.h index 5c39b505fe..1cf75bf01f 100644 --- a/include/llvm/CodeGen/LinkAllCodegenComponents.h +++ b/include/llvm/CodeGen/LinkAllCodegenComponents.h @@ -31,6 +31,7 @@ namespace { (void) llvm::createSimpleRegisterAllocator(); (void) llvm::createLocalRegisterAllocator(); (void) llvm::createLinearScanRegisterAllocator(); + (void) llvm::createGraphColoringRegisterAllocator(); (void) llvm::createBFS_DAGScheduler(NULL, NULL, NULL); (void) llvm::createSimpleDAGScheduler(NULL, NULL, NULL); diff --git a/include/llvm/CodeGen/LiveInterval.h b/include/llvm/CodeGen/LiveInterval.h index b22922c84c..367cefeb36 100644 --- a/include/llvm/CodeGen/LiveInterval.h +++ b/include/llvm/CodeGen/LiveInterval.h @@ -57,16 +57,13 @@ namespace llvm { void dump() const; void print(std::ostream &os) const; + void print(std::ostream *os) const { if (os) print(*os); } private: LiveRange(); // DO NOT IMPLEMENT }; std::ostream& operator<<(std::ostream& os, const LiveRange &LR); - inline OStream& operator<<(OStream& os, const LiveRange &LR) { - if (os.stream()) LR.print(*os.stream()); - return os; - } inline bool operator<(unsigned V, const LiveRange &LR) { @@ -260,9 +257,9 @@ namespace llvm { return beginNumber() < other.beginNumber(); } - void print(OStream OS, const MRegisterInfo *MRI = 0) const; - void print(std::ostream &OS, const MRegisterInfo *MRI = 0) const { - print(OStream(OS), MRI); + void print(std::ostream &OS, const MRegisterInfo *MRI = 0) const; + void print(std::ostream *OS, const MRegisterInfo *MRI = 0) const { + if (OS) print(*OS, MRI); } void dump() const; @@ -273,11 +270,6 @@ namespace llvm { LiveInterval& operator=(const LiveInterval& rhs); // DO NOT IMPLEMENT }; - inline OStream &operator<<(OStream &OS, const LiveInterval &LI) { - LI.print(OS); - return OS; - } - inline std::ostream &operator<<(std::ostream &OS, const LiveInterval &LI) { LI.print(OS); return OS; diff --git a/include/llvm/CodeGen/LiveIntervalAnalysis.h b/include/llvm/CodeGen/LiveIntervalAnalysis.h index 11f836b99a..e0f60452e3 100644 --- a/include/llvm/CodeGen/LiveIntervalAnalysis.h +++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h @@ -161,6 +161,9 @@ namespace llvm { /// print - Implement the dump method. virtual void print(std::ostream &O, const Module* = 0) const; + void print(std::ostream *O, const Module* M = 0) const { + if (O) print(*O, M); + } private: /// RemoveMachineInstrFromMaps - This marks the specified machine instr as diff --git a/include/llvm/CodeGen/MachineBasicBlock.h b/include/llvm/CodeGen/MachineBasicBlock.h index 896d9efe03..1fd36ed55a 100644 --- a/include/llvm/CodeGen/MachineBasicBlock.h +++ b/include/llvm/CodeGen/MachineBasicBlock.h @@ -189,10 +189,8 @@ public: // Debugging methods. void dump() const; - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// getNumber - MachineBasicBlocks are uniquely numbered at the function /// level, unless they're not in a MachineFunction yet, in which case this @@ -226,10 +224,6 @@ private: // Methods used to maintain doubly linked list of blocks... }; std::ostream& operator<<(std::ostream &OS, const MachineBasicBlock &MBB); -inline OStream& operator<<(OStream &OS, const MachineBasicBlock &MBB) { - if (OS.stream()) MBB.print(*OS.stream()); - return OS; -} //===--------------------------------------------------------------------===// // GraphTraits specializations for machine basic block graphs (machine-CFGs) diff --git a/include/llvm/CodeGen/MachineConstantPool.h b/include/llvm/CodeGen/MachineConstantPool.h index bc701f6b86..ffd0e55663 100644 --- a/include/llvm/CodeGen/MachineConstantPool.h +++ b/include/llvm/CodeGen/MachineConstantPool.h @@ -49,17 +49,10 @@ public: /// print - Implement operator<<... /// - void print(OStream &O) const { - if (O.stream()) print(*O.stream()); - } virtual void print(std::ostream &O) const = 0; + void print(std::ostream *O) const { if (O) print(*O); } }; -inline OStream &operator<<(OStream &OS, - const MachineConstantPoolValue &V) { - V.print(OS); - return OS; -} inline std::ostream &operator<<(std::ostream &OS, const MachineConstantPoolValue &V) { V.print(OS); @@ -143,10 +136,8 @@ public: /// print - Used by the MachineFunction printer to print information about /// constant pool objects. Implemented in MachineFunction.cpp /// - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// dump - Call print(std::cerr) to be called from the debugger. /// diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h index f264c91c11..c393b07aaf 100644 --- a/include/llvm/CodeGen/MachineFunction.h +++ b/include/llvm/CodeGen/MachineFunction.h @@ -238,6 +238,7 @@ public: /// to the specified stream. /// void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// viewCFG - This function is meant for use from the debugger. You can just /// say 'call F->viewCFG()' and a ghostview window should pop up from the diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index 77de83768e..ad2ccdf8ca 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -78,6 +78,7 @@ private: MachineOperand() {} void print(std::ostream &os) const; + void print(std::ostream *os) const { if (os) print(*os); } public: MachineOperand(const MachineOperand &M) { @@ -288,10 +289,6 @@ public: IsDead = false; } - friend OStream& operator<<(OStream& os, const MachineOperand& mop) { - if (os.stream()) mop.print(*os.stream()); - return os; - } friend std::ostream& operator<<(std::ostream& os, const MachineOperand& mop) { mop.print(os); return os; @@ -403,16 +400,13 @@ public: // // Debugging support // - void print(OStream &OS, const TargetMachine *TM) const { - if (OS.stream()) print(*OS.stream(), TM); + void print(std::ostream *OS, const TargetMachine *TM) const { + if (OS) print(*OS, TM); } void print(std::ostream &OS, const TargetMachine *TM) const; void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } void dump() const; - friend OStream& operator<<(OStream& os, const MachineInstr& minstr) { - if (os.stream()) minstr.print(*os.stream()); - return os; - } friend std::ostream& operator<<(std::ostream& os, const MachineInstr& minstr){ minstr.print(os); return os; diff --git a/include/llvm/CodeGen/MachineJumpTableInfo.h b/include/llvm/CodeGen/MachineJumpTableInfo.h index 8064fa431c..404ed15fd9 100644 --- a/include/llvm/CodeGen/MachineJumpTableInfo.h +++ b/include/llvm/CodeGen/MachineJumpTableInfo.h @@ -90,6 +90,7 @@ public: /// jump tables. Implemented in MachineFunction.cpp /// void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// dump - Call print(std::cerr) to be called from the debugger. /// diff --git a/include/llvm/CodeGen/SchedGraphCommon.h b/include/llvm/CodeGen/SchedGraphCommon.h index 7da2f732ba..4fcd9acc0e 100644 --- a/include/llvm/CodeGen/SchedGraphCommon.h +++ b/include/llvm/CodeGen/SchedGraphCommon.h @@ -70,10 +70,8 @@ public: void dump(int indent=0) const; // Debugging support - void print(OStream &os) const { - if (os.stream()) print(*os.stream()); - } virtual void print(std::ostream &os) const = 0; + void print(std::ostream *os) const { if (os) print(*os); } protected: friend class SchedGraphCommon; @@ -96,11 +94,6 @@ protected: }; // ostream << operator for SchedGraphNode class -inline OStream &operator<<(OStream &os, - const SchedGraphNodeCommon &node) { - node.print(os); - return os; -} inline std::ostream &operator<<(std::ostream &os, const SchedGraphNodeCommon &node) { node.print(os); @@ -188,10 +181,8 @@ public: public: // Debugging support - void print(OStream &os) const { - if (os.stream()) print(*os.stream()); - } void print(std::ostream &os) const; + void print(std::ostream *os) const { if (os) print(*os); } void dump(int indent=0) const; private: @@ -200,10 +191,6 @@ private: }; // ostream << operator for SchedGraphNode class -inline OStream &operator<<(OStream &os, const SchedGraphEdge &edge) { - edge.print(os); - return os; -} inline std::ostream &operator<<(std::ostream &os, const SchedGraphEdge &edge) { edge.print(os); return os; diff --git a/include/llvm/Constant.h b/include/llvm/Constant.h index 24fb99036e..feb7edef0e 100644 --- a/include/llvm/Constant.h +++ b/include/llvm/Constant.h @@ -54,6 +54,7 @@ public: virtual bool isNullValue() const = 0; virtual void print(std::ostream &O) const; + void print(std::ostream *O) const { if (O) print(*O); } /// canTrap - Return true if evaluation of this constant could trap. This is /// true for things like constant expressions that could divide by zero. diff --git a/include/llvm/Function.h b/include/llvm/Function.h index 58184de3b1..7346c3b3e3 100644 --- a/include/llvm/Function.h +++ b/include/llvm/Function.h @@ -194,6 +194,7 @@ public: bool arg_empty() const { return ArgumentList.empty(); } virtual void print(std::ostream &OS) const { print(OS, 0); } + void print(std::ostream *OS) const { if (OS) print(*OS); } void print(std::ostream &OS, AssemblyAnnotationWriter *AAW) const; /// viewCFG - This function is meant for use from the debugger. You can just diff --git a/include/llvm/GlobalVariable.h b/include/llvm/GlobalVariable.h index 0679e38bb3..5e31c6bd19 100644 --- a/include/llvm/GlobalVariable.h +++ b/include/llvm/GlobalVariable.h @@ -123,6 +123,7 @@ public: virtual void replaceUsesOfWithOnConstant(Value *From, Value *To, Use *U); virtual void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } // Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const GlobalVariable *) { return true; } diff --git a/include/llvm/InlineAsm.h b/include/llvm/InlineAsm.h index b9f707cf83..98f254f538 100644 --- a/include/llvm/InlineAsm.h +++ b/include/llvm/InlineAsm.h @@ -60,6 +60,7 @@ public: const std::string &getConstraintString() const { return Constraints; } virtual void print(std::ostream &O) const { print(O, 0); } + void print(std::ostream *O) const { if (O) print(*O); } void print(std::ostream &OS, AssemblyAnnotationWriter *AAW) const; /// Verify - This static method can be used by the parser to check to see if diff --git a/include/llvm/Instruction.h b/include/llvm/Instruction.h index 4af83c7a56..ce75969902 100644 --- a/include/llvm/Instruction.h +++ b/include/llvm/Instruction.h @@ -169,6 +169,7 @@ public: static bool isTrapping(unsigned op); virtual void print(std::ostream &OS) const { print(OS, 0); } + void print(std::ostream *OS) const { if (OS) print(*OS); } void print(std::ostream &OS, AssemblyAnnotationWriter *AAW) const; /// Methods for support type inquiry through isa, cast, and dyn_cast: diff --git a/include/llvm/Module.h b/include/llvm/Module.h index 35b04b1017..42214af1ac 100644 --- a/include/llvm/Module.h +++ b/include/llvm/Module.h @@ -295,15 +295,13 @@ public: /// @{ public: /// Print the module to an output stream - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream(), 0); - } void print(std::ostream &OS) const { print(OS, 0); } + void print(std::ostream *OS) const { if (OS) print(*OS); } /// Print the module to an output stream with AssemblyAnnotationWriter. - void print(OStream &OS, AssemblyAnnotationWriter *AAW) const { - if (OS.stream()) print(*OS.stream(), AAW); - } void print(std::ostream &OS, AssemblyAnnotationWriter *AAW) const; + void print(std::ostream *OS, AssemblyAnnotationWriter *AAW) const { + if (OS) print(*OS, AAW); + } /// Dump the module to std::cerr (for debugging). void dump() const; /// This function causes all the subinstructions to "let go" of all references diff --git a/include/llvm/Pass.h b/include/llvm/Pass.h index 15381ac978..9663826ccf 100644 --- a/include/llvm/Pass.h +++ b/include/llvm/Pass.h @@ -105,10 +105,8 @@ public: /// provide the Module* in case the analysis doesn't need it it can just be /// ignored. /// - void print(OStream &O, const Module *M) const { - if (O.stream()) print(*O.stream(), M); - } virtual void print(std::ostream &O, const Module *M) const; + void print(std::ostream *O, const Module *M) const { if (O) print(*O, M); } void dump() const; // dump - call print(std::cerr, 0); // Access AnalysisResolver_New diff --git a/include/llvm/Support/ConstantRange.h b/include/llvm/Support/ConstantRange.h index 6866ffeb11..f50e97959d 100644 --- a/include/llvm/Support/ConstantRange.h +++ b/include/llvm/Support/ConstantRange.h @@ -141,10 +141,8 @@ class ConstantRange { /// print - Print out the bounds to a stream... /// - void print(OStream &OS) const { - if (OS.stream()) print(*OS.stream()); - } void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } /// dump - Allow printing from a debugger easily... /// diff --git a/include/llvm/Support/Debug.h b/include/llvm/Support/Debug.h index 09878b9d1e..627d088eb0 100644 --- a/include/llvm/Support/Debug.h +++ b/include/llvm/Support/Debug.h @@ -65,10 +65,10 @@ bool isCurrentDebugType(const char *Type); /// places the std::c* I/O streams into one .cpp file and relieves the whole /// program from having to have hundreds of static c'tor/d'tors for them. /// -OStream getErrorOutputStream(const char *DebugType); +OStream &getErrorOutputStream(const char *DebugType); #ifdef NDEBUG -#define DOUT NullStream +#define DOUT cnull #else #define DOUT getErrorOutputStream(DEBUG_TYPE) #endif diff --git a/include/llvm/Support/Streams.h b/include/llvm/Support/Streams.h index 82ffeeb41b..f141c92a9f 100644 --- a/include/llvm/Support/Streams.h +++ b/include/llvm/Support/Streams.h @@ -39,6 +39,11 @@ namespace llvm { return *this; } +// inline BaseStream &operator << (std::ios &(*Func)(std::ios&)) { +// if (Stream) *Stream << Func; +// return *this; +// } + template <typename Ty> BaseStream &operator << (const Ty &Thing) { if (Stream) *Stream << Thing; @@ -51,6 +56,8 @@ namespace llvm { return *this; } + operator StreamTy* () { return Stream; } + bool operator == (const StreamTy &S) { return &S == Stream; } bool operator != (const StreamTy &S) { return !(*this == S); } bool operator == (const BaseStream &S) { return S.Stream == Stream; } @@ -61,7 +68,7 @@ namespace llvm { typedef BaseStream<std::istream> IStream; typedef BaseStream<std::stringstream> StringStream; - extern OStream NullStream; + extern OStream cnull; extern OStream cout; extern OStream cerr; extern IStream cin; diff --git a/include/llvm/Target/SubtargetFeature.h b/include/llvm/Target/SubtargetFeature.h index 89e6efef37..f6a83dfbdb 100644 --- a/include/llvm/Target/SubtargetFeature.h +++ b/include/llvm/Target/SubtargetFeature.h @@ -98,6 +98,7 @@ public: /// Print feature string. void print(std::ostream &OS) const; + void print(std::ostream *OS) const { if (OS) print(*OS); } // Dump feature info. void dump() const; diff --git a/include/llvm/Type.h b/include/llvm/Type.h index 79fe0dfedf..6cb4e942df 100644 --- a/include/llvm/Type.h +++ b/include/llvm/Type.h @@ -141,10 +141,8 @@ protected: /// mutable std::vector<AbstractTypeUser *> AbstractTypeUsers; public: - void print(OStream &O) const { - if (O.stream()) print(*O.stream()); - } void print(std::ostream &O) const; + void print(std::ostream *O) const { if (O) print(*O); } /// @brief Debugging support: print to stderr void dump() const; diff --git a/include/llvm/Value.h b/include/llvm/Value.h index e8df7cd096..262880a0e7 100644 --- a/include/llvm/Value.h +++ b/include/llvm/Value.h @@ -75,10 +75,8 @@ public: /// print - Implement operator<< on Value... /// - void print(OStream &O) const { - if (O.stream()) print(*O.stream()); - } virtual void print(std::ostream &O) const = 0; + void print(std::ostream *O) const { if (O) print(*O); } /// All values are typed, get the type of this value. /// |