[llvm-branch-commits] [llvm-branch] r271719 - Merging r262297:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Fri Jun  3 15:22:39 2016
New Revision: 271719

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

------------------------------------------------------------------------
r262297 | Matthew.Arsenault | 2016-02-29 20:58:20 -0800 (Mon, 29 Feb 2016) | 2 lines

AMDGPU: Don't use estimated stack size when we know the real stack size

------------------------------------------------------------------------

Modified:
    llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp

Modified: llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp?rev=271719&r1=271718&r2=271719&view=diff
==============================================================================
--- llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp (original)
+++ llvm/branches/release_38/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp Fri Jun  3 15:22:39 2016
@@ -483,7 +483,7 @@ void AMDGPUAsmPrinter::getSIProgramInfo(
   ProgInfo.DX10Clamp = 0;
 
   const MachineFrameInfo *FrameInfo = MF.getFrameInfo();
-  ProgInfo.ScratchSize = FrameInfo->estimateStackSize(MF);
+  ProgInfo.ScratchSize = FrameInfo->getStackSize();
 
   ProgInfo.FlatUsed = FlatUsed;
   ProgInfo.VCCUsed = VCCUsed;