[llvm-branch-commits] [llvm-branch] r183181 - Merging r183108:

[Bill Wendling]

Author: void
Date: Mon Jun  3 23:24:41 2013
New Revision: 183181

URL: http://llvm.org/viewvc/llvm-project?rev=183181&view=rev
Log:
Merging r183108:
------------------------------------------------------------------------
r183108 | vljn | 2013-06-03 08:44:42 -0700 (Mon, 03 Jun 2013) | 1 line

R600: CALL_FS consumes a stack size entry
------------------------------------------------------------------------

Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/lib/Target/R600/R600ControlFlowFinalizer.cpp

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun  3 23:24:41 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181363,181366,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,182072,182112-182113,182253-182254,182297-182298,182344,182364,182385,182387,182394,182485-182486,182585,182656
+/llvm/trunk:155241,181286,181296,181313,181363,181366,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,182072,182112-182113,182253-182254,182297-182298,182344,182364,182385,182387,182394,182485-182486,182585,182656,183108

Modified: llvm/branches/release_33/lib/Target/R600/R600ControlFlowFinalizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/Target/R600/R600ControlFlowFinalizer.cpp?rev=183181&r1=183180&r2=183181&view=diff
==============================================================================
--- llvm/branches/release_33/lib/Target/R600/R600ControlFlowFinalizer.cpp (original)
+++ llvm/branches/release_33/lib/Target/R600/R600ControlFlowFinalizer.cpp Mon Jun  3 23:24:41 2013
@@ -337,6 +337,7 @@ public:
         BuildMI(MBB, MBB.begin(), MBB.findDebugLoc(MBB.begin()),
             getHWInstrDesc(CF_CALL_FS));
         CfCount++;
+        MaxStack = 1;
       }
       std::vector<ClauseFile> FetchClauses, AluClauses;
       for (MachineBasicBlock::iterator I = MBB.begin(), E = MBB.end();