[PATCH] D91244: [GlobalISel] Add missing operand update when copy is required

[Gabriel Hjort Åkerlund via Phabricator via llvm-commits]

ehjogab created this revision.
ehjogab added reviewers: dsanders, arsenm, qcolombet, ab, bjope, rovka.
Herald added a subscriber: hiraditya.
Herald added a project: LLVM.
ehjogab requested review of this revision.
Herald added a subscriber: wdng.

When constraining an operand register using constrainOperandRegClass(),
the function may emit a COPY in case the provided register class does
not match the current operand register class. However, the operand
itself is not updated to make use of the COPY, thereby resulting in
incorrect code. This patch fixes that bug by updating the machine
operand accordingly.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D91244

Files:
  llvm/lib/CodeGen/GlobalISel/InstructionSelector.cpp


Index: llvm/lib/CodeGen/GlobalISel/InstructionSelector.cpp
===================================================================
--- llvm/lib/CodeGen/GlobalISel/InstructionSelector.cpp
+++ llvm/lib/CodeGen/GlobalISel/InstructionSelector.cpp
@@ -41,8 +41,12 @@
   MachineFunction &MF = *MBB.getParent();
   MachineRegisterInfo &MRI = MF.getRegInfo();
 
-  return constrainOperandRegClass(MF, TRI, MRI, TII, RBI, I, RC,
-                                  I.getOperand(OpIdx));
+  MachineOperand &MO = I.getOperand(OpIdx);
+  Register NewReg = constrainOperandRegClass(MF, TRI, MRI, TII, RBI, I, RC, MO);
+  if (NewReg != MO.getReg()) {
+    MO.setReg(NewReg);
+  }
+  return true;
 }
 
 bool InstructionSelector::isOperandImmEqual(


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D91244.304459.patch
Type: text/x-patch
Size: 728 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201111/81153021/attachment.bin>