fix PR23716

2010-04-07  Iain Sandoe <iains@gcc.gnu.org>

	PR objc++/23716
	* objc-act.c (build_module_initializer_routine): Make the argument
	to objc_start_function NULL_TREE when compiling ObjC++.

2010-04-07  Iain Sandoe <iains@gcc.gnu.org>

	PR objc++/23716
	* obj-c++.dg/comp-types-10.mm: Remove XFAIL.

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

diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index 35fed82..472d4aa 100644 (file)
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-07  Iain Sandoe <iains@gcc.gnu.org>
+
+       PR objc++/23716
+       * objc-act.c (build_module_initializer_routine): Make the argument
+       to objc_start_function NULL_TREE when compiling ObjC++.
+
 2010-02-18  Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk>
            Mike Stump  <mikestump@comcast.net>
 

diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index 10cc9bc..7e3a2d8 100644 (file)
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2391,11 +2391,17 @@ build_module_initializer_routine (void)
 
   objc_push_parm (build_decl (input_location,
                              PARM_DECL, NULL_TREE, void_type_node));
+#ifdef OBJCPLUS
+  objc_start_function (get_identifier (TAG_GNUINIT),
+                      build_function_type (void_type_node,
+                                           OBJC_VOID_AT_END),
+                      NULL_TREE, NULL_TREE);
+#else
   objc_start_function (get_identifier (TAG_GNUINIT),
                       build_function_type (void_type_node,
                                            OBJC_VOID_AT_END),
                       NULL_TREE, objc_get_parm_info (0));
-
+#endif
   body = c_begin_compound_stmt (true);
   add_stmt (build_function_call
            (input_location,

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 32c64b3..a074ef2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-07  Iain Sandoe <iains@gcc.gnu.org>
+
+       PR objc++/23716
+       * obj-c++.dg/comp-types-10.mm: Remove XFAIL.
+
 2010-04-07  Jason Merrill  <jason@redhat.com>
 
        * g++.dg/template/dr408.C: New.

diff --git a/gcc/testsuite/obj-c++.dg/comp-types-10.mm b/gcc/testsuite/obj-c++.dg/comp-types-10.mm
index b4da5dd..c7f0cb6 100644 (file)
--- a/gcc/testsuite/obj-c++.dg/comp-types-10.mm
+++ b/gcc/testsuite/obj-c++.dg/comp-types-10.mm
@@ -1,6 +1,5 @@
 /* Yet another mysterious gimplifier crasher.  */
 /* { dg-do compile } */
-/* { dg-xfail-if "PR23716" { ! *-*-darwin* } { "*" } { "" } } */
 /* { dg-prune-output ".*internal compiler error.*" } */
 /* { dg-options "-O3" } */