From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id E51C53858D32 for ; Mon, 26 Sep 2022 10:58:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E51C53858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id AF40F21910; Mon, 26 Sep 2022 10:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1664189885; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZItJA9eiHseCGY6KH1FdeW9nMXmvcvueb9kRG1QxZvw=; b=t944aEOMm4/8X21dJXfTn5lC/rZwf0+fmheLGX1Y/gtfBEH28g9BtGjZ0nV98j7srAjkFR 8esPThteDJa/Mq6VTgOmpu+HouCf8IFRB2XrRfUlo9Uu+kx9IC330KEPh7k3pj2QfVa//n XvQcaaEJhIP33GdtMwDiwAsgp0ioHkc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1664189885; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZItJA9eiHseCGY6KH1FdeW9nMXmvcvueb9kRG1QxZvw=; b=E7dxBgozeZHfvi+8foFq+HV4/bRXTlbfYHSrxf2Efv3yOZA8TUJkG66NPJ+mzCuPRsAWcG BUsqsWRfwLPoK2CA== 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 8857D2C14F; Mon, 26 Sep 2022 10:58:05 +0000 (UTC) Date: Mon, 26 Sep 2022 10:58:04 +0000 (UTC) From: Richard Biener To: Jakub Jelinek cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] reassoc: Handle OFFSET_TYPE like POINTER_TYPE in optimize_range_tests_cmp_bitwise [PR107029[ In-Reply-To: Message-ID: References: User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 List-Id: On Mon, 26 Sep 2022, Jakub Jelinek wrote: > Hi! > > As the testcase shows, OFFSET_TYPE needs the same treatment as > POINTER_TYPE/REFERENCE_TYPE, otherwise we fail the same during the > newly added verification. OFFSET_TYPE is signed though, so unlike > POINTER_TYPE/REFERENCE_TYPE it can also trigger with the > x < 0 && y < 0 && z < 0 to (x | y | z) < 0 > optimization. > > Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, > ok for trunk? OK. > 2022-09-26 Jakub Jelinek > > PR tree-optimization/107029 > * tree-ssa-reassoc.cc (optimize_range_tests_cmp_bitwise): Treat > OFFSET_TYPE like POINTER_TYPE, except that OFFSET_TYPE may be > signed and so can trigger even the (b % 4) == 3 case. > > * g++.dg/torture/pr107029.C: New test. > > --- gcc/tree-ssa-reassoc.cc.jj 2022-09-17 08:18:16.935880254 +0200 > +++ gcc/tree-ssa-reassoc.cc 2022-09-25 14:46:21.746367580 +0200 > @@ -3608,13 +3608,13 @@ optimize_range_tests_cmp_bitwise (enum t > tree type2 = NULL_TREE; > bool strict_overflow_p = false; > candidates.truncate (0); > - if (POINTER_TYPE_P (type1)) > + if (POINTER_TYPE_P (type1) || TREE_CODE (type1) == OFFSET_TYPE) > type1 = pointer_sized_int_node; > for (j = i; j; j = chains[j - 1]) > { > tree type = TREE_TYPE (ranges[j - 1].exp); > strict_overflow_p |= ranges[j - 1].strict_overflow_p; > - if (POINTER_TYPE_P (type)) > + if (POINTER_TYPE_P (type) || TREE_CODE (type) == OFFSET_TYPE) > type = pointer_sized_int_node; > if ((b % 4) == 3) > { > @@ -3646,7 +3646,7 @@ optimize_range_tests_cmp_bitwise (enum t > tree type = TREE_TYPE (ranges[j - 1].exp); > if (j == k) > continue; > - if (POINTER_TYPE_P (type)) > + if (POINTER_TYPE_P (type) || TREE_CODE (type) == OFFSET_TYPE) > type = pointer_sized_int_node; > if ((b % 4) == 3) > { > @@ -3677,10 +3677,20 @@ optimize_range_tests_cmp_bitwise (enum t > op = r->exp; > continue; > } > - if (id == l || POINTER_TYPE_P (TREE_TYPE (op))) > + if (id == l > + || POINTER_TYPE_P (TREE_TYPE (op)) > + || TREE_CODE (TREE_TYPE (op)) == OFFSET_TYPE) > { > code = (b % 4) == 3 ? BIT_NOT_EXPR : NOP_EXPR; > tree type3 = id >= l ? type1 : pointer_sized_int_node; > + if (code == BIT_NOT_EXPR > + && TREE_CODE (TREE_TYPE (op)) == OFFSET_TYPE) > + { > + g = gimple_build_assign (make_ssa_name (type3), > + NOP_EXPR, op); > + gimple_seq_add_stmt_without_update (&seq, g); > + op = gimple_assign_lhs (g); > + } > g = gimple_build_assign (make_ssa_name (type3), code, op); > gimple_seq_add_stmt_without_update (&seq, g); > op = gimple_assign_lhs (g); > @@ -3688,6 +3698,7 @@ optimize_range_tests_cmp_bitwise (enum t > tree type = TREE_TYPE (r->exp); > tree exp = r->exp; > if (POINTER_TYPE_P (type) > + || TREE_CODE (type) == OFFSET_TYPE > || (id >= l && !useless_type_conversion_p (type1, type))) > { > tree type3 = id >= l ? type1 : pointer_sized_int_node; > @@ -3705,7 +3716,7 @@ optimize_range_tests_cmp_bitwise (enum t > op = gimple_assign_lhs (g); > } > type1 = TREE_TYPE (ranges[k - 1].exp); > - if (POINTER_TYPE_P (type1)) > + if (POINTER_TYPE_P (type1) || TREE_CODE (type1) == OFFSET_TYPE) > { > gimple *g > = gimple_build_assign (make_ssa_name (type1), NOP_EXPR, op); > --- gcc/testsuite/g++.dg/torture/pr107029.C.jj 2022-09-25 14:49:18.427954682 +0200 > +++ gcc/testsuite/g++.dg/torture/pr107029.C 2022-09-25 14:49:00.654197418 +0200 > @@ -0,0 +1,19 @@ > +// PR tree-optimization/107029 > +// { dg-do compile } > + > +struct S { long long a; int b; }; > +long long S::*a; > +int S::*b; > +struct A { void foo (bool, bool); void bar (); int c; }; > + > +void > +A::foo (bool a, bool b) > +{ > + c = a || b; > +} > + > +void > +A::bar() > +{ > + foo (a, b); > +} > > Jakub > > -- Richard Biener SUSE Software Solutions Germany GmbH, Frankenstrasse 146, 90461 Nuernberg, Germany; GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman; HRB 36809 (AG Nuernberg)