Merge r128168 to unbreak test.llvmorg-2.9.0-rc3

llvm-svn: 128365

1 files changed, 10 insertions, 4 deletions

diff --git a/clang/test/SemaCXX/goto.cpp b/clang/test/SemaCXX/goto.cpp
index c07e9424733a..d8d5ec51f6e4 100644
--- a/clang/test/SemaCXX/goto.cpp
+++ b/clang/test/SemaCXX/goto.cpp
@@ -2,11 +2,17 @@
 
 // PR9463
 double *end;
-void f() {
+void f(bool b1, bool b2) {
   {
-    int end = 0;
-    goto end;
-    end = 1;
+    do {
+      int end = 0;
+      if (b2) {
+        do {
+          goto end;
+        } while (b2);
+      }
+      end = 1;
+    } while (b1);
   }
 
  end: