[llvm-branch-commits] [llvm-branch] r204644 - Merging r200775:

[Tom Stellard]

Author: tstellar
Date: Mon Mar 24 13:21:35 2014
New Revision: 204644

URL: http://llvm.org/viewvc/llvm-project?rev=204644&view=rev
Log:
Merging r200775:

------------------------------------------------------------------------
r200775 | thomas.stellard | 2014-02-04 09:18:42 -0800 (Tue, 04 Feb 2014) | 5 lines

R600/SI: Don't assume copies will be coalesced in SIFixSGPRCopies

There is no lit test for this, because it would be too big and
complicated, but it does fix a crash in the Arithm/Absdiff.* OpenCV
test.

Modified:
    llvm/branches/release_34/lib/Target/R600/SIFixSGPRCopies.cpp

Modified: llvm/branches/release_34/lib/Target/R600/SIFixSGPRCopies.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Target/R600/SIFixSGPRCopies.cpp?rev=204644&r1=204643&r2=204644&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Target/R600/SIFixSGPRCopies.cpp (original)
+++ llvm/branches/release_34/lib/Target/R600/SIFixSGPRCopies.cpp Mon Mar 24 13:21:35 2014
@@ -187,7 +187,7 @@ bool SIFixSGPRCopies::isVGPRToSGPRCopy(c
       DstRC == &AMDGPU::M0RegRegClass)
     return false;
 
-  SrcRC = inferRegClassFromDef(TRI, MRI, SrcReg, SrcSubReg);
+  SrcRC = TRI->getSubRegClass(MRI.getRegClass(SrcReg), SrcSubReg);
   return TRI->isSGPRClass(DstRC) && TRI->hasVGPRs(SrcRC);
 }