shoot a few more std::ostream print methods in the head.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79814 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-08-23 03:47:42 +00:00
parent 705e07f578
commit c02497f5ba
5 changed files with 12 additions and 45 deletions

View File

@ -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 @@ namespace llvm {
/// 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 @@ namespace llvm {
};
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 @@ namespace llvm {
}
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 @@ namespace llvm {
/// 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 @@ namespace llvm {
/// 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 @@ namespace llvm {
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 @@ namespace llvm {
};
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;

View File

@ -348,9 +348,6 @@ 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);
}
/// addIntervalsForSpills - Create new intervals for spilled defs / uses of
/// the given interval. FIXME: It also returns the weight of the spill slot

View File

@ -103,9 +103,6 @@ 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);
}
};
}

View File

@ -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 @@ void LiveInterval::ComputeJoinedWeight(const LiveInterval &Other) {
}
}
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 @@ void LiveRange::dump() const {
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 LiveInterval::dump() const {
}
void LiveRange::print(std::ostream &os) const {
os << *this;
}
void LiveRange::print(raw_ostream &os) const {
os << *this;
}

View File

@ -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 @@ bool LiveStacks::runOnMachineFunction(MachineFunction &) {
/// 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";
}
}