From: tmsriram <tmsriram@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 8 Jun 2013 00:38:09 +0000 (+0000)
Subject: Fixes PR 57548.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d7354bb436efb6c4da3a81735d111a947afc16c;p=thirdparty%2Fgcc.git

Fixes PR 57548.

2013-06-07  Sriraman Tallam  <tmsriram@google.com>

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



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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4a149b827c4c..31d487a2ccb5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-07  Sriraman Tallam  <tmsriram@google.com>
+
+	PR c++/57548
+	* cp/call.c (build_over_call):  Check if current_function_decl is
+	NULL.
+
 2013-06-07  Jan Hubicka  <jh@suse.cz>
 
 	* symtab.c (symtab_resolve_alias): Do not remove alias attribute.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 0b6a83f34454..dfd061aff5c9 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -7053,7 +7053,8 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
      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)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 55a3ce6d1acb..65c0770797de 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-07  Sriraman Tallam  <tmsriram@google.com>
+
+	PR c++/57548
+	* testsuite/g++.dg/ext/pr57548.C: New test.
+
 2013-06-07  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
 	PR middle-end/57541
diff --git a/gcc/testsuite/g++.dg/ext/pr57548.C b/gcc/testsuite/g++.dg/ext/pr57548.C
new file mode 100644
index 000000000000..1cc728d294c0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/pr57548.C
@@ -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();