public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-211] Pass correct type to irange::contains_p() in ipa-cp.cc.
@ 2023-04-25  7:38 Aldy Hernandez
  0 siblings, 0 replies; only message in thread
From: Aldy Hernandez @ 2023-04-25  7:38 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:36d98023c8b8d2a2e286ab68b1d17402c217102d

commit r14-211-g36d98023c8b8d2a2e286ab68b1d17402c217102d
Author: Aldy Hernandez <aldyh@redhat.com>
Date:   Mon Nov 21 23:18:43 2022 +0100

    Pass correct type to irange::contains_p() in ipa-cp.cc.
    
    There is a call to contains_p() in ipa-cp.cc which passes incompatible
    types.  This currently works because deep in the call chain, the legacy
    code uses tree_int_cst_lt which performs the operation with
    widest_int.  With the upcoming removal of legacy, contains_p() will be
    stricter.
    
    gcc/ChangeLog:
    
            * ipa-cp.cc (ipa_range_contains_p): New.
            (decide_whether_version_node): Use it.

Diff:
---
 gcc/ipa-cp.cc | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc
index b3e0f62e400..65c49558b58 100644
--- a/gcc/ipa-cp.cc
+++ b/gcc/ipa-cp.cc
@@ -6180,6 +6180,23 @@ decide_about_value (struct cgraph_node *node, int index, HOST_WIDE_INT offset,
   return true;
 }
 
+/* Like irange::contains_p(), but convert VAL to the range of R if
+   necessary.  */
+
+static inline bool
+ipa_range_contains_p (const irange &r, tree val)
+{
+  if (r.undefined_p ())
+    return false;
+
+  tree type = r.type ();
+  if (!wi::fits_to_tree_p (wi::to_wide (val), type))
+    return false;
+
+  val = fold_convert (type, val);
+  return r.contains_p (val);
+}
+
 /* Decide whether and what specialized clones of NODE should be created.  */
 
 static bool
@@ -6221,7 +6238,8 @@ decide_whether_version_node (struct cgraph_node *node)
 		 supports this only for integers now.  */
 	      if (TREE_CODE (val->value) == INTEGER_CST
 		  && !plats->m_value_range.bottom_p ()
-		  && !plats->m_value_range.m_vr.contains_p (val->value))
+		  && !ipa_range_contains_p (plats->m_value_range.m_vr,
+					    val->value))
 		{
 		  /* This can happen also if a constant present in the source
 		     code falls outside of the range of parameter's type, so we

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-04-25  7:38 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-25  7:38 [gcc r14-211] Pass correct type to irange::contains_p() in ipa-cp.cc Aldy Hernandez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).