From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 9 Dec 2014 14:44:06 +0000 (+0100)
Subject: re PR bootstrap/64213 (gimple-match.c:1523:6: error: ‘GIMPLE’ was not declared in... 
X-Git-Tag: releases/gcc-4.8.4~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b6180e8b0f8646c74db02da5c2f3aba223f0102;p=thirdparty%2Fgcc.git

re PR bootstrap/64213 (gimple-match.c:1523:6: error: ‘GIMPLE’ was not declared in this scope)

	PR bootstrap/64213
	Revert:
	2014-11-28  H.J. Lu  <hongjiu.lu@intel.com>

	PR rtl-optimization/64037
	* combine.c (setup_incoming_promotions): Pass the argument
	before any promotions happen to promote_function_mode.

testsuite/ChangeLog:

	PR bootstrap/64213
	Revert:
	2014-11-28  H.J. Lu  <hongjiu.lu@intel.com>

	PR rtl-optimization/64037
	* g++.dg/pr64037.C: New test.

From-SVN: r218518
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f2cd1c619286..e18335d1e2c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-09  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR bootstrap/64213
+	Revert:
+	2014-11-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR rtl-optimization/64037
+	* combine.c (setup_incoming_promotions): Pass the argument
+	before any promotions happen to promote_function_mode.
+
 2014-12-08  Richard Biener  <rguenther@suse.de>
 
 	Backport from 4.9 branch
diff --git a/gcc/combine.c b/gcc/combine.c
index a7b1829a105c..0cdd37b9465f 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -1527,8 +1527,8 @@ setup_incoming_promotions (rtx first)
       uns3 = TYPE_UNSIGNED (DECL_ARG_TYPE (arg));
 
       /* The mode and signedness of the argument as it is actually passed,
-         see assign_parm_setup_reg in function.c.  */
-      mode3 = promote_function_mode (TREE_TYPE (arg), mode1, &uns1,
+         after any TARGET_PROMOTE_FUNCTION_ARGS-driven ABI promotions.  */
+      mode3 = promote_function_mode (DECL_ARG_TYPE (arg), mode2, &uns3,
 				     TREE_TYPE (cfun->decl), 0);
 
       /* The mode of the register in which the argument is being passed.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6b5dc8c5569b..076af55c6c21 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-09  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR bootstrap/64213
+	Revert:
+	2014-11-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR rtl-optimization/64037
+	* g++.dg/pr64037.C: New test.
+
 2014-12-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Backport from mainline
diff --git a/gcc/testsuite/g++.dg/pr64037.C b/gcc/testsuite/g++.dg/pr64037.C
deleted file mode 100644
index e5cd0e2ee178..000000000000
--- a/gcc/testsuite/g++.dg/pr64037.C
+++ /dev/null
@@ -1,27 +0,0 @@
-// { dg-do run { target i?86-*-* x86_64-*-* } }
-// { dg-options "-std=c++11 -Os" }
-
-enum class X : unsigned char {
-  V = 2,
-};
-
-static void
-__attribute__((noinline,noclone))
-foo(unsigned &out, unsigned a, X b)
-{
-  out = static_cast<unsigned>(b);
-}
-
-int main()
-{
-  unsigned deadbeef = 0xDEADBEEF;
-  asm volatile ("" : "+d" (deadbeef), "+c" (deadbeef));
-
-  unsigned out;
-  foo(out, 2, X::V);
-
-  if (out != 2)
-    __builtin_abort ();
-
-  return 0;
-}