From patchwork Mon Feb 27 13:58:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 65685 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6DFF83858D32 for ; Mon, 27 Feb 2023 13:58:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6DFF83858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677506322; bh=TBmLK7XzfUDYfl/uxUKwTC9KvpZPOvASwUI41qcnz34=; h=Date:To:cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=pXV10VKinRTP5E7gD2/i5CZFNIEGHDtd0OGiNpdITfgvhRuOwzie1QfnuJMoRKXFA muYPmpEwWd+pBE5PM6ZCQ+0YbzV0d5r0Fw1cxwB8c1qOUE48VMQz5+f88ZT8GdEukf wgcWh3JkobgC7t1WDrWCyxmOduG4Ry7U3HYROBI4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id D4E903858D32 for ; Mon, 27 Feb 2023 13:58:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D4E903858D32 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 0766F1FD63; Mon, 27 Feb 2023 13:58:11 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id C9AD22C141; Mon, 27 Feb 2023 13:58:10 +0000 (UTC) Date: Mon, 27 Feb 2023 13:58:10 +0000 (UTC) To: gcc-patches@gcc.gnu.org cc: aldyh@redhat.com Subject: [PATCH] Fixup possible VR_ANTI_RANGE value_range issues User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20230227135842.6DFF83858D32@sourceware.org> After fixing PR107561 the following avoids looking at VR_ANTI_RANGE ranges where it doesn't seem obvious the code does the correct thing here (lower_bound and upper_bound do not work as expected). Bootstrapped and tested on x86_64-unknown-linux-gnu. OK? Thanks, Richard. * gimple-ssa-sprintf.cc (get_int_range): Avoid VR_ANTI_RANGE by using range_int_cst_p. (format_integer): Likewise. (handle_printf_call): Guard against VR_ANTI_RANGE. * graphite-sese-to-poly.cc (add_param_constraints): Likewise. * tree-ssa-strlen.cc (set_strlen_range): Likewise. --- gcc/gimple-ssa-sprintf.cc | 6 +++--- gcc/graphite-sese-to-poly.cc | 2 +- gcc/tree-ssa-strlen.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/gimple-ssa-sprintf.cc b/gcc/gimple-ssa-sprintf.cc index 18975708d2c..61974072f62 100644 --- a/gcc/gimple-ssa-sprintf.cc +++ b/gcc/gimple-ssa-sprintf.cc @@ -1082,7 +1082,7 @@ get_int_range (tree arg, gimple *stmt, value_range vr; query->range_of_expr (vr, arg, stmt); - if (!vr.undefined_p () && !vr.varying_p ()) + if (range_int_cst_p (&vr)) { HOST_WIDE_INT type_min = (TYPE_UNSIGNED (argtype) @@ -1391,7 +1391,7 @@ format_integer (const directive &dir, tree arg, pointer_query &ptr_qry) value_range vr; ptr_qry.rvals->range_of_expr (vr, arg, dir.info->callstmt); - if (!vr.varying_p () && !vr.undefined_p ()) + if (range_int_cst_p (&vr)) { argmin = wide_int_to_tree (TREE_TYPE (arg), vr.lower_bound ()); argmax = wide_int_to_tree (TREE_TYPE (arg), vr.upper_bound ()); @@ -4623,7 +4623,7 @@ handle_printf_call (gimple_stmt_iterator *gsi, pointer_query &ptr_qry) value_range vr; ptr_qry.rvals->range_of_expr (vr, size, info.callstmt); - if (!vr.undefined_p ()) + if (!vr.undefined_p () && vr.kind () != VR_ANTI_RANGE) { tree type = TREE_TYPE (size); tree tmin = wide_int_to_tree (type, vr.lower_bound ()); diff --git a/gcc/graphite-sese-to-poly.cc b/gcc/graphite-sese-to-poly.cc index fbe7667380a..b89262640ac 100644 --- a/gcc/graphite-sese-to-poly.cc +++ b/gcc/graphite-sese-to-poly.cc @@ -426,7 +426,7 @@ add_param_constraints (scop_p scop, graphite_dim_t p, tree parameter) if (INTEGRAL_TYPE_P (type) && get_range_query (cfun)->range_of_expr (r, parameter) - && !r.undefined_p ()) + && range_int_cst_p (&r)) { min = r.lower_bound (); max = r.upper_bound (); diff --git a/gcc/tree-ssa-strlen.cc b/gcc/tree-ssa-strlen.cc index 7508c1768a5..e1230522564 100644 --- a/gcc/tree-ssa-strlen.cc +++ b/gcc/tree-ssa-strlen.cc @@ -1936,7 +1936,7 @@ set_strlen_range (tree lhs, wide_int min, wide_int max, { value_range r; get_range_query (cfun)->range_of_expr (r, bound); - if (!r.undefined_p ()) + if (range_int_cst_p (&r)) { /* For a bound in a known range, adjust the range determined above as necessary. For a bound in some anti-range or