summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-05-29 06:57:03 +0000
committerBill Wendling <isanbard@gmail.com>2013-05-29 06:57:03 +0000
commit1e3c34de18c1a447407909bd622d95c2675c5e61 (patch)
tree102e71d9a992a0b3073b12a0e951c0e4a9b0ea7f
parentMerging r182394: (diff)
downloadllvm-project-1e3c34de18c1a447407909bd622d95c2675c5e61.tar.gz
llvm-project-1e3c34de18c1a447407909bd622d95c2675c5e61.tar.bz2
llvm-project-1e3c34de18c1a447407909bd622d95c2675c5e61.zip
Merging r182585:
------------------------------------------------------------------------ r182585 | aaronballman | 2013-05-23 07:55:00 -0700 (Thu, 23 May 2013) | 1 line Setting the default value (fixes CRT assertions about uninitialized variable use when doing debug MSVC builds), and fixing coding style. ------------------------------------------------------------------------ llvm-svn: 182830
-rw-r--r--llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp b/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp
index cdda3dab8dab..0f8519024827 100644
--- a/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp
+++ b/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp
@@ -325,7 +325,7 @@ public:
virtual bool runOnMachineFunction(MachineFunction &MF) {
unsigned MaxStack = 0;
unsigned CurrentStack = 0;
- bool hasPush;
+ bool HasPush = false;
for (MachineFunction::iterator MB = MF.begin(), ME = MF.end(); MB != ME;
++MB) {
MachineBasicBlock &MBB = *MB;
@@ -354,7 +354,7 @@ public:
case AMDGPU::CF_ALU_PUSH_BEFORE:
CurrentStack++;
MaxStack = std::max(MaxStack, CurrentStack);
- hasPush = true;
+ HasPush = true;
case AMDGPU::CF_ALU:
I = MI;
AluClauses.push_back(MakeALUClause(MBB, I));
@@ -475,7 +475,7 @@ public:
break;
}
}
- MFI->StackSize = getHWStackSize(MaxStack, hasPush);
+ MFI->StackSize = getHWStackSize(MaxStack, HasPush);
}
return false;