remove the now-dead TM argument to these methods.

llvm-svn: 75276
This commit is contained in:
Chris Lattner 2009-07-10 21:00:45 +00:00
parent ba4d73310a
commit 21c2940553
5 changed files with 10 additions and 10 deletions

View File

@ -603,7 +603,7 @@ void X86ATTAsmPrinter::printPICJumpTableEntry(const MachineJumpTableInfo *MJTI,
O << JTEntryDirective << ' '; O << JTEntryDirective << ' ';
if (Subtarget->isPICStyleRIPRel() || Subtarget->isPICStyleStubPIC(TM)) { if (Subtarget->isPICStyleRIPRel() || Subtarget->isPICStyleStubPIC()) {
O << TAI->getPrivateGlobalPrefix() << getFunctionNumber() O << TAI->getPrivateGlobalPrefix() << getFunctionNumber()
<< '_' << uid << "_set_" << MBB->getNumber(); << '_' << uid << "_set_" << MBB->getNumber();
} else if (Subtarget->isPICStyleGOT()) { } else if (Subtarget->isPICStyleGOT()) {

View File

@ -578,7 +578,7 @@ bool X86FastISel::X86SelectCallAddress(Value *V, X86AddressMode &AM) {
// base and index registers are unused. // base and index registers are unused.
assert(AM.Base.Reg == 0 && AM.IndexReg == 0); assert(AM.Base.Reg == 0 && AM.IndexReg == 0);
AM.Base.Reg = X86::RIP; AM.Base.Reg = X86::RIP;
} else if (Subtarget->isPICStyleStubPIC(TM)) { } else if (Subtarget->isPICStyleStubPIC()) {
AM.GVOpFlags = X86II::MO_PIC_BASE_OFFSET; AM.GVOpFlags = X86II::MO_PIC_BASE_OFFSET;
} else if (Subtarget->isPICStyleGOT()) { } else if (Subtarget->isPICStyleGOT()) {
AM.GVOpFlags = X86II::MO_GOTOFF; AM.GVOpFlags = X86II::MO_GOTOFF;
@ -1620,7 +1620,7 @@ unsigned X86FastISel::TargetMaterializeConstant(Constant *C) {
// x86-32 PIC requires a PIC base register for constant pools. // x86-32 PIC requires a PIC base register for constant pools.
unsigned PICBase = 0; unsigned PICBase = 0;
unsigned char OpFlag = 0; unsigned char OpFlag = 0;
if (Subtarget->isPICStyleStubPIC(TM)) { // Not dynamic-no-pic if (Subtarget->isPICStyleStubPIC()) { // Not dynamic-no-pic
OpFlag = X86II::MO_PIC_BASE_OFFSET; OpFlag = X86II::MO_PIC_BASE_OFFSET;
PICBase = getInstrInfo()->getGlobalBaseReg(&MF); PICBase = getInstrInfo()->getGlobalBaseReg(&MF);
} else if (Subtarget->isPICStyleGOT()) { } else if (Subtarget->isPICStyleGOT()) {

View File

@ -4458,7 +4458,7 @@ X86TargetLowering::LowerConstantPool(SDValue Op, SelectionDAG &DAG) {
WrapperKind = X86ISD::WrapperRIP; WrapperKind = X86ISD::WrapperRIP;
else if (Subtarget->isPICStyleGOT()) else if (Subtarget->isPICStyleGOT())
OpFlag = X86II::MO_GOTOFF; OpFlag = X86II::MO_GOTOFF;
else if (Subtarget->isPICStyleStubPIC(getTargetMachine())) else if (Subtarget->isPICStyleStubPIC())
OpFlag = X86II::MO_PIC_BASE_OFFSET; OpFlag = X86II::MO_PIC_BASE_OFFSET;
SDValue Result = DAG.getTargetConstantPool(CP->getConstVal(), getPointerTy(), SDValue Result = DAG.getTargetConstantPool(CP->getConstVal(), getPointerTy(),
@ -4490,7 +4490,7 @@ SDValue X86TargetLowering::LowerJumpTable(SDValue Op, SelectionDAG &DAG) {
WrapperKind = X86ISD::WrapperRIP; WrapperKind = X86ISD::WrapperRIP;
else if (Subtarget->isPICStyleGOT()) else if (Subtarget->isPICStyleGOT())
OpFlag = X86II::MO_GOTOFF; OpFlag = X86II::MO_GOTOFF;
else if (Subtarget->isPICStyleStubPIC(getTargetMachine())) else if (Subtarget->isPICStyleStubPIC())
OpFlag = X86II::MO_PIC_BASE_OFFSET; OpFlag = X86II::MO_PIC_BASE_OFFSET;
SDValue Result = DAG.getTargetJumpTable(JT->getIndex(), getPointerTy(), SDValue Result = DAG.getTargetJumpTable(JT->getIndex(), getPointerTy(),
@ -4522,7 +4522,7 @@ X86TargetLowering::LowerExternalSymbol(SDValue Op, SelectionDAG &DAG) {
WrapperKind = X86ISD::WrapperRIP; WrapperKind = X86ISD::WrapperRIP;
else if (Subtarget->isPICStyleGOT()) else if (Subtarget->isPICStyleGOT())
OpFlag = X86II::MO_GOTOFF; OpFlag = X86II::MO_GOTOFF;
else if (Subtarget->isPICStyleStubPIC(getTargetMachine())) else if (Subtarget->isPICStyleStubPIC())
OpFlag = X86II::MO_PIC_BASE_OFFSET; OpFlag = X86II::MO_PIC_BASE_OFFSET;
SDValue Result = DAG.getTargetExternalSymbol(Sym, getPointerTy(), OpFlag); SDValue Result = DAG.getTargetExternalSymbol(Sym, getPointerTy(), OpFlag);

View File

@ -75,7 +75,7 @@ ClassifyGlobalReference(const GlobalValue *GV, const TargetMachine &TM) const {
return X86II::MO_GOT; return X86II::MO_GOT;
} }
if (isPICStyleStubPIC(TM)) { // Darwin/32 in PIC mode. if (isPICStyleStubPIC()) { // Darwin/32 in PIC mode.
// Determine whether we have a stub reference and/or whether the reference // Determine whether we have a stub reference and/or whether the reference
// is relative to the PIC base or not. // is relative to the PIC base or not.
@ -100,7 +100,7 @@ ClassifyGlobalReference(const GlobalValue *GV, const TargetMachine &TM) const {
return X86II::MO_PIC_BASE_OFFSET; return X86II::MO_PIC_BASE_OFFSET;
} }
if (isPICStyleStubNoDynamic(TM)) { // Darwin/32 in -mdynamic-no-pic mode. if (isPICStyleStubNoDynamic()) { // Darwin/32 in -mdynamic-no-pic mode.
// Determine whether we have a stub reference. // Determine whether we have a stub reference.
// If this is a strong reference to a definition, it is definitely not // If this is a strong reference to a definition, it is definitely not

View File

@ -187,11 +187,11 @@ public:
bool isPICStyleGOT() const { return PICStyle == PICStyles::GOT; } bool isPICStyleGOT() const { return PICStyle == PICStyles::GOT; }
bool isPICStyleRIPRel() const { return PICStyle == PICStyles::RIPRel; } bool isPICStyleRIPRel() const { return PICStyle == PICStyles::RIPRel; }
bool isPICStyleStubPIC(const TargetMachine &TM) const { bool isPICStyleStubPIC() const {
return PICStyle == PICStyles::StubPIC; return PICStyle == PICStyles::StubPIC;
} }
bool isPICStyleStubNoDynamic(const TargetMachine &TM) const { bool isPICStyleStubNoDynamic() const {
return PICStyle == PICStyles::StubDynamicNoPIC; return PICStyle == PICStyles::StubDynamicNoPIC;
} }
bool isPICStyleStubAny() const { bool isPICStyleStubAny() const {