Patchwork PR57548 - Call to multiversioned function from global namespace

login
register
mail settings
Submitter Sriraman Tallam
Date June 7, 2013, 6:16 p.m.
Message ID <CAAs8HmwDf-cqZSfHV5FdvoeWPe3oM7BJPdAjcqGdrn+whNZEKQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/249782/
State New
Headers show

Comments

Sriraman Tallam - June 7, 2013, 6:16 p.m.
Hi,

See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57548

The ICE here is because of a multi-versioned function called from
global namespace and has no caller.  This ICEs in target hook
ix86_can_inline_p as caller is 0x0.  The following simple patch
attached fixes this problem.

        * cp/call.c (build_over_call):  Check if current_function_decl is
        NULL.
        * testsuite/g++.dg/ext/pr57548.C: New test.

Ok to submit?

Thanks
Sri
This patch fixes PR 57548.  The problem here is that the caller to fum
not from a function and current_function_decl is NULL when processing the
call.  The simple fix in call.c to check current_function_decl before
calling can_inline_p target hook.

	* cp/call.c (build_over_call):  Check if current_function_decl is
	NULL.
	* testsuite/g++.dg/ext/pr57548.C: New test.
Jason Merrill - June 7, 2013, 7:42 p.m.
OK.

Jason
Eric Botcazou - June 8, 2013, 3:22 p.m.
> The ICE here is because of a multi-versioned function called from
> global namespace and has no caller.  This ICEs in target hook
> ix86_can_inline_p as caller is 0x0.  The following simple patch
> attached fixes this problem.
> 
>         * cp/call.c (build_over_call):  Check if current_function_decl is
>         NULL.
>         * testsuite/g++.dg/ext/pr57548.C: New test.

ChangeLogs for cp/ must go into cp/ChangeLog without the cp/ prefix.

Patch

Index: cp/call.c
===================================================================
--- cp/call.c	(revision 199662)
+++ cp/call.c	(working copy)
@@ -7053,7 +7053,8 @@  build_over_call (struct z_candidate *cand, int fla
      otherwise the call should go through the dispatcher.  */
 
   if (DECL_FUNCTION_VERSIONED (fn)
-      && !targetm.target_option.can_inline_p (current_function_decl, fn))
+      && (current_function_decl == NULL
+	  || !targetm.target_option.can_inline_p (current_function_decl, fn)))
     {
       fn = get_function_version_dispatcher (fn);
       if (fn == NULL)
Index: testsuite/g++.dg/ext/pr57548.C
===================================================================
--- testsuite/g++.dg/ext/pr57548.C	(revision 0)
+++ testsuite/g++.dg/ext/pr57548.C	(revision 0)
@@ -0,0 +1,25 @@ 
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-require-ifunc "" }  */
+
+int fum (); // Extra declaration that is merged with the second one.
+int fum () __attribute__ ((target("default")));
+
+
+int fum () __attribute__((target( "mmx")));
+int fum () __attribute__((target( "popcnt")));
+int fum () __attribute__((target( "sse")));
+int fum () __attribute__((target( "sse2")));
+int fum () __attribute__((target( "sse3")));
+int fum () __attribute__((target( "ssse3")));
+int fum () __attribute__((target( "sse4.1")));
+int fum () __attribute__((target( "sse4.2")));
+int fum () __attribute__((target( "avx")));
+int fum () __attribute__((target( "avx2")));
+
+int fum () __attribute__((target("arch=core2")));
+int fum () __attribute__((target("arch=corei7")));
+int fum () __attribute__((target("arch=atom")));
+
+int (*p)() = &fum;
+
+int j = fum();