re PR c++/27820 (ICE with duplicate label)

	PR c++/27820
	* decl.c (define_label): Return error_mark_node on error.
	* semantics.c (finish_label_stmt): Don't call
	add_stmt for invalid labels.

	PR c++/27820
	* g++.dg/other/label1.C: New test.

Co-Authored-By: Andrew Pinski <pinskia@gmail.com>
From-SVN: r115284

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2c88746868e4f85dc699631965c04728ab196f07..1984ee7b1429c4c6d0672b05697411d76205a4d3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-08  Lee Millward  <lee.millward@gmail.com>
+           Andrew Pinski  <pinskia@gmail.com>
+       
+       PR c++/27820
+       * decl.c (define_label): Return error_mark_node on error.
+       * semantics.c (finish_label_stmt): Don't call
+       add_stmt for invalid labels.
+       
 2006-07-05  Jason Merrill  <jason@redhat.com>
 
        PR c++/13983

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 9edf5b8d2f8d40aea2037960aedd9139105c2508..4fc6d624bc38212a315fabfaf4cf58c1106be6ba 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2328,7 +2328,10 @@ define_label (location_t location, tree name)
     pedwarn ("label named wchar_t");
 
   if (DECL_INITIAL (decl) != NULL_TREE)
-    error ("duplicate label %qD", decl);
+    {
+      error ("duplicate label %qD", decl);
+      POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, error_mark_node);
+    }
   else
     {
       /* Mark label as having been defined.  */

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index e8c342ac31a46be5cbedacb7c24fed2a796fb9f1..74c34d85f2a5c43b15d03a427caff3d4d26ce6eb 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1250,6 +1250,10 @@ tree
 finish_label_stmt (tree name)
 {
   tree decl = define_label (input_location, name);
+
+  if (decl == error_mark_node)
+    return error_mark_node;
+
   return add_stmt (build_stmt (LABEL_EXPR, decl));
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ac222ca81a9f803b2d9889a2b96fc4b16c457b2..f4c458402011f57e8edae950fc45ba76d44a6bca 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-08  Lee Millward  <lee.millward@gmail.com>
+
+       PR c++/27820
+       * g++.dg/other/label1.C: New test.
+       
 2006-07-02  Roger Sayle  <roger@eyesopen.com>
 
        PR middle-end/27428

diff --git a/gcc/testsuite/g++.dg/other/label1.C b/gcc/testsuite/g++.dg/other/label1.C
new file mode 100644 (file)
index 0000000..74572dc
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/label1.C
@@ -0,0 +1,7 @@
+//PR c++/27820
+
+void foo()
+{
+    L: L: ; // { dg-error "duplicate label" }
+}
+