re PR c++/50742 (tree check fail in check_previous_goto_1)

	PR c++/50742
	* decl.c (check_previous_goto_1): Handle using-decl.

From-SVN: r180160

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ad46384349db697949ac440806801bbe9d99c50f..24ca6548d1c0aac768ad15edc123435d80cb0240 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-18  Jason Merrill  <jason@redhat.com>
+
+       PR c++/50742
+       * decl.c (check_previous_goto_1): Handle using-decl.
+
 2011-10-18  Jason Merrill  <jason@redhat.com>
 
        PR c++/50500

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8b5033f32060b2884d5bb67d7872f0b95028ed8c..4b5b6c8122643252c8f7fc739a60171616e0abf1 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2683,7 +2683,8 @@ check_previous_goto_1 (tree decl, cp_binding_level* level, tree names,
       tree new_decls, old_decls = (b == level ? names : NULL_TREE);
 
       for (new_decls = b->names; new_decls != old_decls;
-          new_decls = DECL_CHAIN (new_decls))
+          new_decls = (DECL_P (new_decls) ? DECL_CHAIN (new_decls)
+                       : TREE_CHAIN (new_decls)))
        {
          int problem = decl_jump_unsafe (new_decls);
          if (! problem)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c794711e678cd6d18df608e809a1bdfd148f22bd..d2cf1a83df5166cc593565d634281a4a9d65f853 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-10-18  Jason Merrill  <jason@redhat.com>
 
+       PR c++/50742
+       * g++.dg/lookup/using23.C: New.
+
        PR c++/50500
        * g++.dg/cpp0x/implicit12.C: New.
        * g++.dg/cpp0x/defaulted20.C: Adjust.

diff --git a/gcc/testsuite/g++.dg/lookup/using23.C b/gcc/testsuite/g++.dg/lookup/using23.C
new file mode 100644 (file)
index 0000000..5dd8d85
--- /dev/null
+++ b/gcc/testsuite/g++.dg/lookup/using23.C
@@ -0,0 +1,13 @@
+// PR c++/50742
+
+typedef int A;
+
+void f(int i)
+{
+  switch (i)
+    {
+    case 0:
+      using ::A;
+    default:;
+    }
+}