From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Thu, 28 Aug 2014 06:24:40 +0000 (+0000)
Subject: rtl.h (tls_referenced_p): Take a const_rtx rather than an rtx.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6180e3d8705e54db209efe706a778e79965be34c;p=gcc.git

rtl.h (tls_referenced_p): Take a const_rtx rather than an rtx.

gcc/
	* rtl.h (tls_referenced_p): Take a const_rtx rather than an rtx.
	* rtlanal.c (tls_referenced_p_1): Delete.
	(tls_referenced_p): Take a const_rtx rather than an rtx.
	Use FOR_EACH_SUBRTX rather than for_each_rtx.

From-SVN: r214658
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00e4bcecb4a..20915cb115c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-28  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* rtl.h (tls_referenced_p): Take a const_rtx rather than an rtx.
+	* rtlanal.c (tls_referenced_p_1): Delete.
+	(tls_referenced_p): Take a const_rtx rather than an rtx.
+	Use FOR_EACH_SUBRTX rather than for_each_rtx.
+
 2014-08-28  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* rtl.h (for_each_inc_dec_fn): Remove special case for -1.
diff --git a/gcc/rtl.h b/gcc/rtl.h
index b18f2e15835..0b617a32d08 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -2797,7 +2797,7 @@ extern void replace_label_in_insn (rtx_insn *, rtx, rtx, bool);
 extern bool rtx_referenced_p (const_rtx, const_rtx);
 extern bool tablejump_p (const_rtx, rtx *, rtx_jump_table_data **);
 extern int computed_jump_p (const_rtx);
-extern bool tls_referenced_p (rtx);
+extern bool tls_referenced_p (const_rtx);
 
 typedef int (*rtx_function) (rtx *, void *);
 extern int for_each_rtx (rtx *, rtx_function, void *);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 3e3af7285d0..ceaa7ab7a74 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -6075,21 +6075,17 @@ get_index_code (const struct address_info *info)
   return SCRATCH;
 }
 
-/* Return 1 if *X is a thread-local symbol.  */
-
-static int
-tls_referenced_p_1 (rtx *x, void *)
-{
-  return GET_CODE (*x) == SYMBOL_REF && SYMBOL_REF_TLS_MODEL (*x) != 0;
-}
-
 /* Return true if X contains a thread-local symbol.  */
 
 bool
-tls_referenced_p (rtx x)
+tls_referenced_p (const_rtx x)
 {
   if (!targetm.have_tls)
     return false;
 
-  return for_each_rtx (&x, &tls_referenced_p_1, 0);
+  subrtx_iterator::array_type array;
+  FOR_EACH_SUBRTX (iter, array, x, NONCONST)
+    if (GET_CODE (*iter) == SYMBOL_REF && SYMBOL_REF_TLS_MODEL (*iter) != 0)
+      return true;
+  return false;
 }