[llvm] r276676 - Fix invalid iterator use in safestack coloring.

[Hans Wennborg via llvm-commits]

Merged to 3.9 in r278281 as it fixed PR28863.

On Mon, Jul 25, 2016 at 12:25 PM, Evgeniy Stepanov via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: eugenis
> Date: Mon Jul 25 14:25:40 2016
> New Revision: 276676
>
> URL: http://llvm.org/viewvc/llvm-project?rev=276676&view=rev
> Log:
> Fix invalid iterator use in safestack coloring.
>
> Added:
>     llvm/trunk/test/Transforms/SafeStack/layout-region-split.ll
> Modified:
>     llvm/trunk/lib/CodeGen/SafeStackLayout.cpp
>
> Modified: llvm/trunk/lib/CodeGen/SafeStackLayout.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SafeStackLayout.cpp?rev=276676&r1=276675&r2=276676&view=diff
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SafeStackLayout.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SafeStackLayout.cpp Mon Jul 25 14:25:40 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;
>
> Added: llvm/trunk/test/Transforms/SafeStack/layout-region-split.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SafeStack/layout-region-split.ll?rev=276676&view=auto
> ==============================================================================
> --- llvm/trunk/test/Transforms/SafeStack/layout-region-split.ll (added)
> +++ llvm/trunk/test/Transforms/SafeStack/layout-region-split.ll Mon Jul 25 14:25:40 2016
> @@ -0,0 +1,84 @@
> +; Regression test for safestack layout. Used to fail with asan.
> +; RUN: opt -safe-stack -S -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck %s
> +
> +define void @f() safestack {
> +; CHECK-LABEL: define void @f
> +entry:
> +; CHECK:  %[[USP:.*]] = load i8*, i8** @__safestack_unsafe_stack_ptr
> +; CHECK:   getelementptr i8, i8* %[[USP]], i32 -224
> +
> +  %x0 = alloca i8, align 16
> +  %x1 = alloca i8, align 16
> +  %x2 = alloca i8, align 16
> +  %x3 = alloca i8, align 16
> +  %x4 = alloca i8, align 16
> +  %x5 = alloca i8, align 16
> +  %x6 = alloca i8, align 16
> +  %x7 = alloca i8, align 16
> +  %x8 = alloca i8, align 16
> +  %x9 = alloca i8, align 16
> +  %x10 = alloca i8, align 16
> +  %x11 = alloca i8, align 16
> +  %x12 = alloca i8, align 16
> +  %x13 = alloca i8, align 16
> +  %y0 = alloca i8, align 2
> +  %y1 = alloca i8, align 2
> +  %y2 = alloca i8, align 2
> +  %y3 = alloca i8, align 2
> +  %y4 = alloca i8, align 2
> +  %y5 = alloca i8, align 2
> +  %y6 = alloca i8, align 2
> +  %y7 = alloca i8, align 2
> +  %y8 = alloca i8, align 2
> +
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -16
> +  call void @capture8(i8* %x0)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -32
> +  call void @capture8(i8* %x1)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -48
> +  call void @capture8(i8* %x2)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -64
> +  call void @capture8(i8* %x3)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -80
> +  call void @capture8(i8* %x4)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -96
> +  call void @capture8(i8* %x5)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -112
> +  call void @capture8(i8* %x6)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -128
> +  call void @capture8(i8* %x7)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -144
> +  call void @capture8(i8* %x8)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -160
> +  call void @capture8(i8* %x9)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -176
> +  call void @capture8(i8* %x10)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -192
> +  call void @capture8(i8* %x11)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -208
> +  call void @capture8(i8* %x12)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -224
> +  call void @capture8(i8* %x13)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -2
> +  call void @capture8(i8* %y0)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -4
> +  call void @capture8(i8* %y1)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -6
> +  call void @capture8(i8* %y2)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -8
> +  call void @capture8(i8* %y3)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -10
> +  call void @capture8(i8* %y4)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -12
> +  call void @capture8(i8* %y5)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -14
> +  call void @capture8(i8* %y6)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -18
> +  call void @capture8(i8* %y7)
> +; CHECK: getelementptr i8, i8* %[[USP]], i32 -20
> +  call void @capture8(i8* %y8)
> +
> +  ret void
> +}
> +
> +declare void @capture8(i8*)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits