From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 3 Jan 2019 10:11:40 +0000 (+0000)
Subject: 	PR c++/88636
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0627c5c96094dfbb296816df58b431acc41a04aa;p=thirdparty%2Fgcc.git

	PR c++/88636
	* decl.c (builtin_function_1): Return result of pushdecl_top_level
	or pushdecl rather than decl.

	* g++.target/i386/pr88636.C: New test.


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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5b94654b10a8..32576c58b84e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88636
+	* decl.c (builtin_function_1): Return result of pushdecl_top_level
+	or pushdecl rather than decl.
+
 2019-01-03  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* tree.c (handle_nodiscard_attribute): Improve warning location.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2003008afc06..15bc4887a596 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4536,11 +4536,9 @@ builtin_function_1 (tree decl, tree context, bool is_global)
     }
 
   if (is_global)
-    pushdecl_top_level (decl);
+    return pushdecl_top_level (decl);
   else
-    pushdecl (decl);
-
-  return decl;
+    return pushdecl (decl);
 }
 
 tree
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c077f7a9a8e2..413bb098b7c1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/88636
+	* g++.target/i386/pr88636.C: New test.
+
 2019-01-03  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* g++.dg/cpp1z/nodiscard3.C: Test locations too.
diff --git a/gcc/testsuite/g++.target/i386/pr88636.C b/gcc/testsuite/g++.target/i386/pr88636.C
new file mode 100644
index 000000000000..fa4c1327bd5f
--- /dev/null
+++ b/gcc/testsuite/g++.target/i386/pr88636.C
@@ -0,0 +1,6 @@
+// PR c++/88636
+// { dg-do compile }
+// { dg-options "-msse2 -mno-sse3 -fno-exceptions --param ggc-min-heapsize=0" }
+
+extern unsigned int __builtin_ia32_crc32si (unsigned int, unsigned int);
+#pragma GCC target("sse4.2")