The real fix for post-r284255 failures

llvm-svn: 284264

diff --git a/llvm/lib/Target/Hexagon/HexagonRDFOpt.cpp b/llvm/lib/Target/Hexagon/HexagonRDFOpt.cpp
index 197315335566be61c728ff73b6421080eb9b750e..1e42d648d7e990435fdc541cb1be3b6b6801879d 100644 (file)
--- a/llvm/lib/Target/Hexagon/HexagonRDFOpt.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonRDFOpt.cpp
@@ -102,7 +102,6 @@ bool HexagonCP::interpretAsCopy(const MachineInstr *MI, EqualityMap &EM) {
   unsigned Opc = MI->getOpcode();
   switch (Opc) {
     case Hexagon::A2_combinew: {
-      break; // FIXME
       const MachineOperand &DstOp = MI->getOperand(0);
       const MachineOperand &HiOp = MI->getOperand(1);
       const MachineOperand &LoOp = MI->getOperand(2);

diff --git a/llvm/lib/Target/Hexagon/RDFGraph.cpp b/llvm/lib/Target/Hexagon/RDFGraph.cpp
index 746a55ef9334c859750cff73de62bcd2ba852189..f25fcf72065b3dc94953aeb6aa1a411d0503613d 100644 (file)
--- a/llvm/lib/Target/Hexagon/RDFGraph.cpp
+++ b/llvm/lib/Target/Hexagon/RDFGraph.cpp
@@ -1046,8 +1046,8 @@ void DataFlowGraph::build(unsigned Options) {
 
 RegisterRef DataFlowGraph::makeRegRef(unsigned Reg, unsigned Sub) const {
   assert(TargetRegisterInfo::isPhysicalRegister(Reg));
-  assert(Sub == 0 && "Not expecting subregisters");
-  // TODO handle subregisters just to see if LMI would work with it.
+  if (Sub != 0)
+    Reg = TRI.getSubReg(Reg, Sub);
   return RegisterRef(Reg);
 }