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

Backing out 48911 for now. It's breaking stuff. 

llvm-svn: 48922
This commit is contained in:
Evan Cheng 2008-03-28 17:49:06 +00:00
parent c719424caa
commit b8654202dd
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
llvm/lib/Target/X86/X86InstrInfo.cpp
View File

@ -748,12 +748,6 @@ static bool regIsPICBase(unsigned BaseReg, MachineRegisterInfo &MRI) {
}
return isPICBase;
}
/// isGVStub - Return true if the GV requires an extra load to get the
/// real address.
static inline bool isGVStub(GlobalValue *GV, X86TargetMachine &TM) {
return TM.getSubtarget<X86Subtarget>().GVRequiresExtraLoad(GV, TM, false);
}
bool X86InstrInfo::isReallyTriviallyReMaterializable(MachineInstr *MI) const {
switch (MI->getOpcode()) {
@ -775,9 +769,7 @@ bool X86InstrInfo::isReallyTriviallyReMaterializable(MachineInstr *MI) const {
if (MI->getOperand(1).isReg() &&
MI->getOperand(2).isImm() &&
MI->getOperand(3).isReg() && MI->getOperand(3).getReg() == 0 &&
(MI->getOperand(4).isCPI() ||
(MI->getOperand(4).isGlobal() &&
isGVStub(MI->getOperand(4).getGlobal(), TM)))) {
MI->getOperand(4).isCPI()) {
unsigned BaseReg = MI->getOperand(1).getReg();
if (BaseReg == 0)
return true;
@ -839,9 +831,13 @@ bool X86InstrInfo::isInvariantLoad(MachineInstr *MI) const {
// Loads from constant pools are trivially invariant.
if (MO.isCPI())
return true;
if (MO.isGlobal())
return isGVStub(MO.getGlobal(), TM);
if (MO.isGlobal()) {
if (TM.getSubtarget<X86Subtarget>().GVRequiresExtraLoad(MO.getGlobal(),
TM, false))
return true;
return false;
}
// If this is a load from an invariant stack slot, the load is a constant.
if (MO.isFI()) {