[llvm] r284264 - The real fix for post-r284255 failures

[Krzysztof Parzyszek via llvm-commits]

Author: kparzysz
Date: Fri Oct 14 14:06:25 2016
New Revision: 284264

URL: http://llvm.org/viewvc/llvm-project?rev=284264&view=rev
Log:
The real fix for post-r284255 failures

Modified:
    llvm/trunk/lib/Target/Hexagon/HexagonRDFOpt.cpp
    llvm/trunk/lib/Target/Hexagon/RDFGraph.cpp

Modified: llvm/trunk/lib/Target/Hexagon/HexagonRDFOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/HexagonRDFOpt.cpp?rev=284264&r1=284263&r2=284264&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/HexagonRDFOpt.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/HexagonRDFOpt.cpp Fri Oct 14 14:06:25 2016
@@ -102,7 +102,6 @@ bool HexagonCP::interpretAsCopy(const Ma
   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);

Modified: llvm/trunk/lib/Target/Hexagon/RDFGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Hexagon/RDFGraph.cpp?rev=284264&r1=284263&r2=284264&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Hexagon/RDFGraph.cpp (original)
+++ llvm/trunk/lib/Target/Hexagon/RDFGraph.cpp Fri Oct 14 14:06:25 2016
@@ -1046,8 +1046,8 @@ void DataFlowGraph::build(unsigned Optio
 
 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);
 }