From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 16 Sep 2008 22:03:57 +0000 (+0000)
Subject: 	PR c++/37532
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=69201cc54f32a32d8ae557c53a842b6cc433fa6f;p=pf3gnuchains%2Fgcc-fork.git

	PR c++/37532
	* lex.c (init_reswords): Don't populate ridpointers for D_CONLY
	reserved words.

	* g++.dg/parse/crash46.C: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@140399 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5b36ffc1e9c..1bc8596a9b5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-16  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/37532
+	* lex.c (init_reswords): Don't populate ridpointers for D_CONLY
+	reserved words.
+
 2008-09-15  Aldy Hernandez  <aldyh@redhat.com>
 
 	* decl.c (duplicate_decls): Call error_at.
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index d5ddce88aef..d708b09658b 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -172,7 +172,6 @@ init_reswords (void)
   tree id;
   int mask = 0;
 
-  mask |= D_CONLY;
   if (cxx_dialect != cxx0x)
     mask |= D_CXX0X;
   if (flag_no_asm)
@@ -186,6 +185,8 @@ init_reswords (void)
   ridpointers = GGC_CNEWVEC (tree, (int) RID_MAX);
   for (i = 0; i < num_c_common_reswords; i++)
     {
+      if (c_common_reswords[i].disable & D_CONLY)
+	continue;
       id = get_identifier (c_common_reswords[i].word);
       C_SET_RID_CODE (id, c_common_reswords[i].rid);
       ridpointers [(int) c_common_reswords[i].rid] = id;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7bb93723e5e..40b58f4ed09 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2008-09-16  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/37532
+	* g++.dg/parse/crash46.C: New test.
+
 	PR testsuite/36889
 	* lib/fortran-torture.exp (get-fortran-torture-options): Only
 	set test_tree_vectorize on i?86/x86_64 resp. sparc* if sse2 resp.
diff --git a/gcc/testsuite/g++.dg/parse/crash46.C b/gcc/testsuite/g++.dg/parse/crash46.C
new file mode 100644
index 00000000000..f454a0a192c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/crash46.C
@@ -0,0 +1,18 @@
+// PR c++/37532
+// { dg-do compile }
+
+void
+foo (_Decimal32)	// { dg-error "declared void" }
+{
+}
+			// { dg-error "was not declared" "" { target *-*-* } 5 }
+void
+bar (_Bool)		// { dg-error "declared void" }
+{
+}
+			// { dg-error "was not declared" "" { target *-*-* } 10 }
+void
+baz (_Fract)		// { dg-error "declared void" }
+{
+}
+			// { dg-error "was not declared" "" { target *-*-* } 15 }