re PR objc++/53441 (obj-c++.dg/ivar-invalid-type-1.mm ICE)

	PR obj-c++/53441
	* decl.c (grokdeclarator): Check that current_class_type is non-NULL
	before calling constructor_name_p.

From-SVN: r187888

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4da78b850cb1bd0e642b18aadd3ab88964dfdeb5..daf1a6cfe3e93bffaaf6a46d2541eb2b1991f31c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-24  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR obj-c++/53441
+       * decl.c (grokdeclarator): Check that current_class_type is non-NULL
+       before calling constructor_name_p.
+
 2012-05-24  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/32080

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index d883da6b6406a84fc85990ef784f5ea63995cd92..14a6a40d6cee3d1fc0a176a1179177229216a558 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9803,7 +9803,8 @@ grokdeclarator (const cp_declarator *declarator,
               clones.  */
            DECL_ABSTRACT (decl) = 1;
        }
-      else if (constructor_name_p (unqualified_id, current_class_type))
+      else if (current_class_type
+              && constructor_name_p (unqualified_id, current_class_type))
        permerror (input_location, "ISO C++ forbids nested type %qD with same name "
                   "as enclosing class",
                   unqualified_id);