Index: llvm/trunk/lib/CodeGen/MachineCombiner.cpp =================================================================== --- llvm/trunk/lib/CodeGen/MachineCombiner.cpp +++ llvm/trunk/lib/CodeGen/MachineCombiner.cpp @@ -559,14 +559,12 @@ dbgs() << "\tFor the Pattern (" << (int)P << ") these instructions could be removed\n"; for (auto const *InstrPtr : DelInstrs) { dbgs() << "\t\t" << STI->getSchedInfoStr(*InstrPtr) << ": "; - InstrPtr->print(dbgs(), false, false, TII); - dbgs() << "\n"; + InstrPtr->print(dbgs(), false, false, false, TII); } dbgs() << "\tThese instructions could replace the removed ones\n"; for (auto const *InstrPtr : InsInstrs) { dbgs() << "\t\t" << STI->getSchedInfoStr(*InstrPtr) << ": "; - InstrPtr->print(dbgs(), false, false, TII); - dbgs() << "\n"; + InstrPtr->print(dbgs(), false, false, false, TII); } }); Index: llvm/trunk/lib/CodeGen/MachineInstr.cpp =================================================================== --- llvm/trunk/lib/CodeGen/MachineInstr.cpp +++ llvm/trunk/lib/CodeGen/MachineInstr.cpp @@ -1235,6 +1235,8 @@ if (const MachineFunction *MF = getMFIfAvailable(*this)) { F = &MF->getFunction(); M = F->getParent(); + if (!TII) + TII = MF->getSubtarget().getInstrInfo(); } ModuleSlotTracker MST(M);