From: Richard Henderson <rth@redhat.com>
Date: Thu, 20 Nov 2014 14:13:04 +0000 (-0800)
Subject: re PR target/63977 (r217769 caused many failures)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ad1048a5287c73ce13fac4183dfc01811943e791;p=gcc.git

re PR target/63977 (r217769 caused many failures)

PR target/63977

 * config/i386/i386.c (ix86_static_chain): Reinstate the check
 for DECL_STATIC_CHAIN.

From-SVN: r217853
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9aaac254e9d..1c6a04dcfdc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-20  Richard Henderson <rth@redhat.com>
+
+	PR target/63977
+	* config/i386/i386.c (ix86_static_chain): Reinstate the check
+	for DECL_STATIC_CHAIN.
+
 2014-11-20  Tejas Belagod  <tejas.belagod@arm.com>
 
 	* config/aarch64/aarch64-protos.h (aarch64_classify_symbol):
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index fffddfc7311..6c8dbd66811 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -27360,6 +27360,12 @@ ix86_static_chain (const_tree fndecl_or_type, bool incoming_p)
 {
   unsigned regno;
 
+  /* While this function won't be called by the middle-end when a static
+     chain isn't needed, it's also used throughout the backend so it's
+     easiest to keep this check centralized.  */
+  if (DECL_P (fndecl_or_type) && !DECL_STATIC_CHAIN (fndecl_or_type))
+    return NULL;
+
   if (TARGET_64BIT)
     {
       /* We always use R10 in 64-bit mode.  */