From 2c4068f40966bd72277d4cc29540aee669611f96 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper@gmail.com>
Date: Tue, 6 Oct 2015 05:39:59 +0000
Subject: [TwoAddressInstructionPass] When looking for a 3 addr conversion
 after commuting, make sure regB has been updated to take into account the
 commute.

llvm-svn: 249378
---
 llvm/lib/CodeGen/TwoAddressInstructionPass.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'llvm/lib/CodeGen/TwoAddressInstructionPass.cpp')

diff --git a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
index 717b07ca059..1b4fe705eb8 100644
--- a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -1265,6 +1265,13 @@ tryInstructionTransform(MachineBasicBlock::iterator &mi,
     return true;
   }
 
+  // If we commuted, regB may have changed so we should re-sample it to avoid
+  // confusing the three address conversion below.
+  if (Commuted) {
+    regB = MI.getOperand(SrcIdx).getReg();
+    regBKilled = isKilled(MI, regB, MRI, TII, LIS, true);
+  }
+
   if (MI.isConvertibleTo3Addr()) {
     // This instruction is potentially convertible to a true
     // three-address instruction.  Check if it is profitable.
-- 
cgit v1.2.3