aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/TwoAddressInstructionPass.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/CodeGen/TwoAddressInstructionPass.cpp')
-rw-r--r--lib/CodeGen/TwoAddressInstructionPass.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp
index 5f0a923f99..81864b7c0e 100644
--- a/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -330,10 +330,13 @@ bool TwoAddressInstructionPass::runOnMachineFunction(MachineFunction &MF) {
InstructionRearranged:
const TargetRegisterClass* rc = MF.getRegInfo().getRegClass(regA);
MachineInstr *Orig = MRI->getVRegDef(regB);
+ const TargetInstrDesc &OrigTID = Orig->getDesc();
bool SawStore = false;
if (EnableReMat && Orig && Orig->isSafeToMove(TII, SawStore) &&
- TII->isTriviallyReMaterializable(Orig)) {
+ OrigTID.isAsCheapAsAMove() && !OrigTID.mayLoad() &&
+ !OrigTID.isSimpleLoad()) {
+ DEBUG(cerr << "2addr: REMATTING : " << *Orig << "\n");
TII->reMaterialize(*mbbi, mi, regA, Orig);
ReMattedInstrs.insert(Orig);
} else {