[llvm-branch-commits] [llvm-branch] r278281 - Merging r276676:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Aug 10 15:02:49 2016
New Revision: 278281

URL: http://llvm.org/viewvc/llvm-project?rev=278281&view=rev
Log:
Merging r276676:
------------------------------------------------------------------------
r276676 | eugenis | 2016-07-25 12:25:40 -0700 (Mon, 25 Jul 2016) | 1 line

Fix invalid iterator use in safestack coloring.
------------------------------------------------------------------------

Added:
    llvm/branches/release_39/test/Transforms/SafeStack/layout-region-split.ll
      - copied unchanged from r276676, llvm/trunk/test/Transforms/SafeStack/layout-region-split.ll
Modified:
    llvm/branches/release_39/   (props changed)
    llvm/branches/release_39/lib/CodeGen/SafeStackLayout.cpp

Propchange: llvm/branches/release_39/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 10 15:02:49 2016
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276740,276823,276956,276980,277114,277135,277371,277500,277504,277625,277691,277693,277773,278002,278086,278133
+/llvm/trunk:155241,275868-275870,275879,275898,275928,275935,275946,275978,275981,276015,276051,276077,276109,276119,276181,276209,276236-276237,276358,276364,276368,276389,276435,276438,276479,276510,276648,276676,276740,276823,276956,276980,277114,277135,277371,277500,277504,277625,277691,277693,277773,278002,278086,278133

Modified: llvm/branches/release_39/lib/CodeGen/SafeStackLayout.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_39/lib/CodeGen/SafeStackLayout.cpp?rev=278281&r1=278280&r2=278281&view=diff
==============================================================================
--- llvm/branches/release_39/lib/CodeGen/SafeStackLayout.cpp (original)
+++ llvm/branches/release_39/lib/CodeGen/SafeStackLayout.cpp Wed Aug 10 15:02:49 2016
@@ -100,7 +100,8 @@ void StackLayout::layoutObject(StackObje
   }
 
   // Split starting and ending regions if necessary.
-  for (StackRegion &R : Regions) {
+  for (unsigned i = 0; i < Regions.size(); ++i) {
+    StackRegion &R = Regions[i];
     if (Start > R.Start && Start < R.End) {
       StackRegion R0 = R;
       R.Start = R0.End = Start;