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

[X86] Fix several places that weren't passing what they though they were to MachineInstr::print 

Over a year ago, MachineInstr gained a fourth boolean parameter that occurs
before the TII pointer. When this happened, several places started accidentally
passing TII into this boolean parameter instead of the TII parameter.

llvm-svn: 362312
This commit is contained in:
Craig Topper 2019-06-02 01:36:48 +00:00
parent 737de4d363
commit 78c794a70b
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/CodeGen/LiveDebugValues.cpp
View File

@ -457,7 +457,9 @@ void LiveDebugValues::insertTransferDebugPair(
VarLoc VL(*NewDebugInstr, LS);
ProcessVarLoc(VL, NewDebugInstr);
LLVM_DEBUG(dbgs() << "Creating DBG_VALUE inst for register copy: ";
NewDebugInstr->print(dbgs(), false, false, false, TII));
NewDebugInstr->print(dbgs(), /*IsStandalone*/false,
/*SkipOpers*/false, /*SkipDebugLoc*/false,
/*AddNewLine*/true, TII));
return;
}
case TransferKind::TransferSpill: {
@ -474,7 +476,9 @@ void LiveDebugValues::insertTransferDebugPair(
SpillLocation.SpillOffset, LS);
ProcessVarLoc(VL, NewDebugInstr);
LLVM_DEBUG(dbgs() << "Creating DBG_VALUE inst for spill: ";
NewDebugInstr->print(dbgs(), false, false, false, TII));
NewDebugInstr->print(dbgs(), /*IsStandalone*/false,
/*SkipOpers*/false, /*SkipDebugLoc*/false,
/*AddNewLine*/true, TII));
return;
}
case TransferKind::TransferRestore: {
@ -488,7 +492,9 @@ void LiveDebugValues::insertTransferDebugPair(
VarLoc VL(*NewDebugInstr, LS);
ProcessVarLoc(VL, NewDebugInstr);
LLVM_DEBUG(dbgs() << "Creating DBG_VALUE inst for register restore: ";
NewDebugInstr->print(dbgs(), false, false, false, TII));
NewDebugInstr->print(dbgs(), /*IsStandalone*/false,
/*SkipOpers*/false, /*SkipDebugLoc*/false,
/*AddNewLine*/true, TII));
return;
}
}

6
llvm/lib/CodeGen/MachineCombiner.cpp
View File

@ -561,10 +561,12 @@ bool MachineCombiner::combineInstructions(MachineBasicBlock *MBB) {
dbgs() << "\tFor the Pattern (" << (int)P
<< ") these instructions could be removed\n";
for (auto const *InstrPtr : DelInstrs)
InstrPtr->print(dbgs(), false, false, false, TII);
InstrPtr->print(dbgs(), /*IsStandalone*/false, /*SkipOpers*/false,
/*SkipDebugLoc*/false, /*AddNewLine*/true, TII);
dbgs() << "\tThese instructions could replace the removed ones\n";
for (auto const *InstrPtr : InsInstrs)
InstrPtr->print(dbgs(), false, false, false, TII);
InstrPtr->print(dbgs(), /*IsStandalone*/false, /*SkipOpers*/false,
/*SkipDebugLoc*/false, /*AddNewLine*/true, TII);
});
bool SubstituteAlways = false;

2
llvm/lib/CodeGen/MachineInstr.cpp
View File

@ -1472,7 +1472,7 @@ void MachineInstr::print(raw_ostream &OS, bool IsStandalone, bool SkipOpers,
ModuleSlotTracker MST(M);
if (F)
MST.incorporateFunction(*F);
print(OS, MST, IsStandalone, SkipOpers, SkipDebugLoc, TII);
print(OS, MST, IsStandalone, SkipOpers, SkipDebugLoc, AddNewLine, TII);
}
void MachineInstr::print(raw_ostream &OS, ModuleSlotTracker &MST,

3
llvm/unittests/CodeGen/MachineInstrTest.cpp
View File

@ -265,7 +265,8 @@ TEST(MachineInstrPrintingTest, DebugLocPrinting) {
std::string str;
raw_string_ostream OS(str);
MI->print(OS);
MI->print(OS, /*IsStandalone*/true, /*SkipOpers*/false, /*SkipDebugLoc*/false,
/*AddNewLine*/false);
ASSERT_TRUE(
StringRef(OS.str()).startswith("$noreg = UNKNOWN debug-location "));
ASSERT_TRUE(