From 059773e8917ce69e2ce5ad8f702b2ac99a62a9cb Mon Sep 17 00:00:00 2001
From: Bill Wendling <isanbard@gmail.com>
Date: Sun, 27 Mar 2011 01:17:09 +0000
Subject: Merge r128168 to unbreak test.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_29@128365 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/SemaCXX/goto.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/SemaCXX/goto.cpp b/test/SemaCXX/goto.cpp
index c07e942473..d8d5ec51f6 100644
--- a/test/SemaCXX/goto.cpp
+++ b/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:
-- 
cgit v1.2.3