Clean up my changes to jump-diagnostic handling for local variables of

class type (or array thereof), eliminating some redundant checks
(thanks Eli!) and adding some tests where the behavior differs in
C++98/03 vs. C++0x.

llvm-svn: 132218

1 files changed, 23 insertions, 2 deletions

diff --git a/clang/test/CXX/stmt.stmt/stmt.dcl/p3.cpp b/clang/test/CXX/stmt.stmt/stmt.dcl/p3.cpp
index 2cf745e4506..18fd34039ee 100644
--- a/clang/test/CXX/stmt.stmt/stmt.dcl/p3.cpp
+++ b/clang/test/CXX/stmt.stmt/stmt.dcl/p3.cpp
@@ -1,12 +1,11 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
-// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s
 
 // PR10034
 struct X {};
 
 void exx(X) {}
 
-int main(int argc, char **argv)
+int test_ptr10034(int argc, char **argv)
 {
  if (argc > 3)
    goto end;
@@ -24,3 +23,25 @@ int main(int argc, char **argv)
    }
    return 0;
 }
+
+struct Y {
+  ~Y();
+};
+
+void test_Y() {
+  goto end; // expected-error{{goto into protected scope}}
+  Y y; // expected-note{{jump bypasses variable initialization}}
+ end:
+  return;
+}
+
+struct Z {
+  Z operator=(const Z&);
+};
+
+void test_Z() {
+  goto end; // expected-error{{goto into protected scope}}
+  Z z; // expected-note{{jump bypasses variable initialization}}
+ end:
+  return;
+}