[llvm-commits] [llvm] r79814 - in /llvm/trunk: include/llvm/CodeGen/LiveInterval.h include/llvm/CodeGen/LiveIntervalAnalysis.h include/llvm/CodeGen/LiveStackAnalysis.h lib/CodeGen/LiveInterval.cpp lib/CodeGen/LiveStackAnalysis.cpp
Chris Lattner
sabre at nondot.org
Sat Aug 22 20:47:43 PDT 2009
Author: lattner
Date: Sat Aug 22 22:47:42 2009
New Revision: 79814
URL: http://llvm.org/viewvc/llvm-project?rev=79814&view=rev
Log:
shoot a few more std::ostream print methods in the head.
Modified:
llvm/trunk/include/llvm/CodeGen/LiveInterval.h
llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
llvm/trunk/include/llvm/CodeGen/LiveStackAnalysis.h
llvm/trunk/lib/CodeGen/LiveInterval.cpp
llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=79814&r1=79813&r2=79814&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Sat Aug 22 22:47:42 2009
@@ -24,7 +24,6 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/AlignOf.h"
-#include <iosfwd>
#include <cassert>
#include <climits>
@@ -49,7 +48,6 @@
/// index of the MBB in which the PHI originally existed. This can be used
/// to insert code (spills or copies) which deals with the value, which will
/// be live in to the block.
-
class VNInfo {
private:
enum {
@@ -183,7 +181,7 @@
};
- inline bool operator<(const VNInfo::KillInfo &k1, const VNInfo::KillInfo &k2) {
+ inline bool operator<(const VNInfo::KillInfo &k1, const VNInfo::KillInfo &k2){
return k1.killIdx < k2.killIdx;
}
@@ -221,16 +219,12 @@
}
void dump() const;
- void print(std::ostream &os) const;
- void print(std::ostream *os) const { if (os) print(*os); }
void print(raw_ostream &os) const;
- void print(raw_ostream *os) const { if (os) print(*os); }
private:
LiveRange(); // DO NOT IMPLEMENT
};
- std::ostream& operator<<(std::ostream& os, const LiveRange &LR);
raw_ostream& operator<<(raw_ostream& os, const LiveRange &LR);
@@ -351,7 +345,7 @@
/// getNextValue - Create a new value number and return it. MIIdx specifies
/// the instruction that defines the value number.
VNInfo *getNextValue(unsigned MIIdx, MachineInstr *CopyMI,
- bool isDefAccurate, BumpPtrAllocator &VNInfoAllocator) {
+ bool isDefAccurate, BumpPtrAllocator &VNInfoAllocator){
assert(MIIdx != ~0u && MIIdx != ~1u &&
"PHI def / unused flags should now be passed explicitly.");
@@ -366,7 +360,8 @@
/// Create a copy of the given value. The new value will be identical except
/// for the Value number.
- VNInfo *createValueCopy(const VNInfo *orig, BumpPtrAllocator &VNInfoAllocator) {
+ VNInfo *createValueCopy(const VNInfo *orig,
+ BumpPtrAllocator &VNInfoAllocator) {
VNInfo *VNI =
static_cast<VNInfo*>(VNInfoAllocator.Allocate((unsigned)sizeof(VNInfo),
@@ -605,14 +600,7 @@
return beginNumber() < other.beginNumber();
}
- void print(std::ostream &OS, const TargetRegisterInfo *TRI = 0) const;
- void print(std::ostream *OS, const TargetRegisterInfo *TRI = 0) const {
- if (OS) print(*OS, TRI);
- }
void print(raw_ostream &OS, const TargetRegisterInfo *TRI = 0) const;
- void print(raw_ostream *OS, const TargetRegisterInfo *TRI = 0) const {
- if (OS) print(*OS, TRI);
- }
void dump() const;
private:
@@ -624,10 +612,6 @@
};
- inline std::ostream &operator<<(std::ostream &OS, const LiveInterval &LI) {
- LI.print(OS);
- return OS;
- }
inline raw_ostream &operator<<(raw_ostream &OS, const LiveInterval &LI) {
LI.print(OS);
return OS;
Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=79814&r1=79813&r2=79814&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Sat Aug 22 22:47:42 2009
@@ -348,9 +348,6 @@
/// 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);
- }
/// addIntervalsForSpills - Create new intervals for spilled defs / uses of
/// the given interval. FIXME: It also returns the weight of the spill slot
Modified: llvm/trunk/include/llvm/CodeGen/LiveStackAnalysis.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveStackAnalysis.h?rev=79814&r1=79813&r2=79814&view=diff
==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LiveStackAnalysis.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LiveStackAnalysis.h Sat Aug 22 22:47:42 2009
@@ -103,9 +103,6 @@
/// 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);
- }
};
}
Modified: llvm/trunk/lib/CodeGen/LiveInterval.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveInterval.cpp?rev=79814&r1=79813&r2=79814&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveInterval.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveInterval.cpp Sat Aug 22 22:47:42 2009
@@ -24,7 +24,6 @@
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include <algorithm>
using namespace llvm;
@@ -816,9 +815,6 @@
}
}
-std::ostream& llvm::operator<<(std::ostream& os, const LiveRange &LR) {
- return os << '[' << LR.start << ',' << LR.end << ':' << LR.valno->id << ")";
-}
raw_ostream& llvm::operator<<(raw_ostream& os, const LiveRange &LR) {
return os << '[' << LR.start << ',' << LR.end << ':' << LR.valno->id << ")";
}
@@ -827,14 +823,7 @@
errs() << *this << "\n";
}
-void LiveInterval::print(std::ostream &OS,
- const TargetRegisterInfo *TRI) const {
- raw_os_ostream RawOS(OS);
- print(RawOS, TRI);
-}
-
-void LiveInterval::print(raw_ostream &OS,
- const TargetRegisterInfo *TRI) const {
+void LiveInterval::print(raw_ostream &OS, const TargetRegisterInfo *TRI) const {
if (isStackSlot())
OS << "SS#" << getStackSlotIndex();
else if (TRI && TargetRegisterInfo::isPhysicalRegister(reg))
@@ -896,9 +885,6 @@
}
-void LiveRange::print(std::ostream &os) const {
- os << *this;
-}
void LiveRange::print(raw_ostream &os) const {
os << *this;
}
Modified: llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp?rev=79814&r1=79813&r2=79814&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveStackAnalysis.cpp Sat Aug 22 22:47:42 2009
@@ -19,6 +19,7 @@
#include "llvm/CodeGen/Passes.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/Support/Debug.h"
+#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/Statistic.h"
#include <limits>
using namespace llvm;
@@ -53,14 +54,16 @@
/// print - Implement the dump method.
void LiveStacks::print(std::ostream &O, const Module*) const {
- O << "********** INTERVALS **********\n";
+ raw_os_ostream OS(O);
+
+ OS << "********** INTERVALS **********\n";
for (const_iterator I = begin(), E = end(); I != E; ++I) {
- I->second.print(O);
+ I->second.print(OS);
int Slot = I->first;
const TargetRegisterClass *RC = getIntervalRegClass(Slot);
if (RC)
- O << " [" << RC->getName() << "]\n";
+ OS << " [" << RC->getName() << "]\n";
else
- O << " [Unknown]\n";
+ OS << " [Unknown]\n";
}
}
More information about the llvm-commits
mailing list