[llvm-branch-commits] [llvm-branch] r143451 - in /llvm/branches/release_30: ./ lib/Target/PowerPC/PPCFrameLowering.cpp

[Bill Wendling]

Author: void
Date: Tue Nov  1 00:11:00 2011
New Revision: 143451

URL: http://llvm.org/viewvc/llvm-project?rev=143451&view=rev
Log:
Merging r143290:
------------------------------------------------------------------------
r143290 | d0k | 2011-10-29 12:43:38 -0700 (Sat, 29 Oct 2011) | 3 lines

PPC: Disable moves for all CR subregisters.

Should fix assertion failures on ppc buildbots.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_30/   (props changed)
    llvm/branches/release_30/lib/Target/PowerPC/PPCFrameLowering.cpp

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov  1 00:11:00 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869,142956,142994,142998,143006,143194,143222,143247,143302-143303,143437
+/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806,142841,142869,142956,142994,142998,143006,143194,143222,143247,143290,143302-143303,143437

Modified: llvm/branches/release_30/lib/Target/PowerPC/PPCFrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/lib/Target/PowerPC/PPCFrameLowering.cpp?rev=143451&r1=143450&r2=143451&view=diff
==============================================================================
--- llvm/branches/release_30/lib/Target/PowerPC/PPCFrameLowering.cpp (original)
+++ llvm/branches/release_30/lib/Target/PowerPC/PPCFrameLowering.cpp Tue Nov  1 00:11:00 2011
@@ -490,10 +490,8 @@
 
       // This is a bit of a hack: CR2LT, CR2GT, CR2EQ and CR2UN are just
       // subregisters of CR2. We just need to emit a move of CR2.
-      if (Reg == PPC::CR2LT || Reg == PPC::CR2GT || Reg == PPC::CR2EQ)
+      if (PPC::CRBITRCRegisterClass->contains(Reg))
         continue;
-      if (Reg == PPC::CR2UN)
-        Reg = PPC::CR2;
 
       MachineLocation CSDst(MachineLocation::VirtualFP, Offset);
       MachineLocation CSSrc(Reg);