From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 23 Oct 2012 16:55:56 +0000 (+0200)
Subject: re PR c++/54988 (fpmath=sse target pragma causes inlining failure because of target... 
X-Git-Tag: releases/gcc-4.8.0~2612
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0065c7ebdf0c336da82203cf876c09682dbc8b9b;p=thirdparty%2Fgcc.git

re PR c++/54988 (fpmath=sse target pragma causes inlining failure because of target specific option mismatch)

	PR c++/54988
	* decl2.c (cplus_decl_attributes): Don't return early
	if attributes is NULL.

	* c-c++-common/pr54988.c: New test.

From-SVN: r192722
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0a9707a76a70..aa619b7c3c25 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/54988
+	* decl2.c (cplus_decl_attributes): Don't return early
+	if attributes is NULL.
+
 2012-10-23  Michael Matz  <matz@suse.de>
 
 	* tree-ssa-operands.h (struct def_optype_d, def_optype_p): Remove.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 688a72332cec..8657712916ae 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1309,8 +1309,7 @@ void
 cplus_decl_attributes (tree *decl, tree attributes, int flags)
 {
   if (*decl == NULL_TREE || *decl == void_type_node
-      || *decl == error_mark_node
-      || attributes == NULL_TREE)
+      || *decl == error_mark_node)
     return;
 
   if (processing_template_decl)
@@ -1319,8 +1318,6 @@ cplus_decl_attributes (tree *decl, tree attributes, int flags)
 	return;
 
       save_template_attributes (&attributes, decl);
-      if (attributes == NULL_TREE)
-	return;
     }
 
   cp_check_const_attributes (attributes);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ddfef9753f19..76f0f423bb9a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-23  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/54988
+	* c-c++-common/pr54988.c: New test.
+
 2012-10-23  Jan Hubicka  <jh@suse.cz>
 
 	* gcc.dg/tree-prof/peel-1.c: New testcase.
diff --git a/gcc/testsuite/c-c++-common/pr54988.c b/gcc/testsuite/c-c++-common/pr54988.c
new file mode 100644
index 000000000000..59406d6ab24d
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/pr54988.c
@@ -0,0 +1,20 @@
+/* PR c++/54988 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+/* { dg-additional-options "-msse2" { target { i?86-*-* x86_64-*-* } } } */
+
+#if defined(__i386__) || defined(__x86_64__)
+#pragma GCC target "fpmath=sse"
+#endif
+
+static inline __attribute__ ((always_inline)) int
+foo (int x)
+{
+  return x;
+}
+
+int
+bar (int x)
+{
+  return foo (x);
+}