projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[X86][Haswell][SchedModel] Add architecture specific scheduling models.
[oota-llvm.git]
/
lib
/
CodeGen
/
MachineCombiner.cpp
diff --git
a/lib/CodeGen/MachineCombiner.cpp
b/lib/CodeGen/MachineCombiner.cpp
index 7cf3506c0a55ae2333de22524ff834802a80ade8..aeb864efa340243c59c5528308894c7f634bbf36 100644
(file)
--- a/
lib/CodeGen/MachineCombiner.cpp
+++ b/
lib/CodeGen/MachineCombiner.cpp
@@
-273,7
+273,9
@@
bool MachineCombiner::preservesResourceLen(
// Compute current resource length
// Compute current resource length
- ArrayRef<const MachineBasicBlock *> MBBarr(MBB);
+ //ArrayRef<const MachineBasicBlock *> MBBarr(MBB);
+ SmallVector <const MachineBasicBlock *, 1> MBBarr;
+ MBBarr.push_back(MBB);
unsigned ResLenBeforeCombine = BlockTrace.getResourceLength(MBBarr);
// Deal with SC rather than Instructions.
unsigned ResLenBeforeCombine = BlockTrace.getResourceLength(MBBarr);
// Deal with SC rather than Instructions.
@@
-378,7
+380,7
@@
bool MachineCombiner::combineInstructions(MachineBasicBlock *MBB) {
MBB->insert((MachineBasicBlock::iterator) & MI,
(MachineInstr *)InstrPtr);
for (auto *InstrPtr : DelInstrs)
MBB->insert((MachineBasicBlock::iterator) & MI,
(MachineInstr *)InstrPtr);
for (auto *InstrPtr : DelInstrs)
- InstrPtr->eraseFromParent();
+ InstrPtr->eraseFromParent
AndMarkDBGValuesForRemoval
();
Changed = true;
++NumInstCombined;
Changed = true;
++NumInstCombined;