commit 9efa1ce1457cd0ea90e3329ea29b03f6b6ec5269
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Sep 14 00:42:34 2010 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Tue Sep 14 00:42:34 2010 +0000
tree 974065f491112abb339654f2a214c89377872dbe
parent 2967e28ee7ba585067f23e309c976d38ebd8699c

Fix VLA miscompilation.

llvm.stacksave/llvm.stackrestore wasn't emitted for VLAs in inner scopes.
Fixes r8403108.

llvm-svn: 113822

clang/lib/CodeGen/CodeGenFunction.h

diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h
index 37795ed..acf1e4d 100644
--- a/clang/lib/CodeGen/CodeGenFunction.h
+++ b/clang/lib/CodeGen/CodeGenFunction.h
@@ -562,6 +562,7 @@
     {
       CleanupStackDepth = CGF.EHStack.stable_begin();
       OldDidCallStackSave = CGF.DidCallStackSave;
+      CGF.DidCallStackSave = false;
     }
 
     /// \brief Exit this cleanup scope, emitting any accumulated

clang/test/CodeGen/vla.c

diff --git a/clang/test/CodeGen/vla.c b/clang/test/CodeGen/vla.c
index 0c53900..1770472 100644
--- a/clang/test/CodeGen/vla.c
+++ b/clang/test/CodeGen/vla.c
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -emit-llvm -o %t
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
 
 int b(char* x);
 
@@ -35,3 +35,18 @@
   int (*a[5])[count];
   int (*b)[][count];
 }
+
+// rdar://8403108
+// CHECK: define void @f_8403108
+void f_8403108(unsigned x) {
+  // CHECK: call i8* @llvm.stacksave()
+  char s1[x];
+  while (1) {
+    // CHECK: call i8* @llvm.stacksave()
+    char s2[x];
+    if (1)
+      break;
+  // CHECK: call void @llvm.stackrestore(i8*
+  }
+  // CHECK: call void @llvm.stackrestore(i8*
+}