Missed merge that goes with the merge of r128210.

--- Merging r128208 into '.':
U    test/SemaCXX/goto.cpp
A    test/SemaCXX/goto2.cpp
U    lib/Sema/IdentifierResolver.cpp



git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_29@128364 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 20 insertions, 0 deletions

diff --git a/test/SemaCXX/goto.cpp b/test/SemaCXX/goto.cpp
index d7057bb87f..c07e942473 100644
--- a/test/SemaCXX/goto.cpp
+++ b/test/SemaCXX/goto.cpp
@@ -13,6 +13,26 @@ void f() {
   return;
 }
 
+namespace N {
+  float* end;
+  void f(bool b1, bool b2) {
+    {
+      do {
+        int end = 0;
+        if (b2) {
+          do {
+            goto end;
+          } while (b2);
+        }
+        end = 1;
+      } while (b1);
+    }
+
+  end:
+    return;
+  }
+}
+
 void g() {
   end = 1; // expected-error{{assigning to 'double *' from incompatible type 'int'}}
 }