From patchwork Fri Sep 15 14:13:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew MacLeod X-Patchwork-Id: 140451 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1078397vqi; Fri, 15 Sep 2023 07:14:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGP0sDN60bxzuesFgwJkjFEmdJCYTF+PvlFK0A+5Q17ebu9MhwEwoRmAngO2116l/aJhfjN X-Received: by 2002:a17:907:b0c:b0:9ad:a46c:2936 with SMTP id h12-20020a1709070b0c00b009ada46c2936mr1631350ejl.8.1694787276054; Fri, 15 Sep 2023 07:14:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694787276; cv=none; d=google.com; s=arc-20160816; b=gjBkEz/0E4XE+Rr873UkTys3UHImDs9XCQTe029ZqraI1q4qgnNCyvl7IsD2CiYd4Y o0FL8znAA0NDZfqFV0dm/Ltj293cjZ3/cdI8zE1TRNMnaoPIKVkhf4+bBXYZdzHK9b5w JdNMitPj69EgqNxZAcEORaKE9e7O1Y4TZ60CdNoxSVYbfTUujcyFKHRxfaSjgVy746VL b7KqY0g6YtLyi4I9SVOSDEDNEkOwYifOrwy1/lxuRqDDvLSvOksgtelXp1VtwUjQO08U X1fOM2pE06/AdPWy5ohRUJ1JdckEFkVpHAY+YLOT7rde2geNM4c9caqi2ZyZmTYFNexH LKZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:content-language :subject:cc:to:user-agent:mime-version:date:message-id:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=DLKj+mHnQEM0uKU2bYW1fKHdZpjZkHirJYDhc6ktVNI=; fh=ZE6EPE2PZ3ED3Eq5R4AB8kSxxMSuW2qQfXnHfqWWl4c=; b=IK6UFmcyN+ngpPXx0Nv13GU8sdgVXM6OTcDUTQqlhlYuRdlsr1zgMDM+cEQ8bVvx6/ kesgNgXZm0E9TmYslhmippQjwHgI26qksmlP9WIoSgCCBrIGesSuqMSEnqQM/99JUlmr +txjPSYSRlSA8KfSGcCvP4aETikgSpdXljC87fsgJHUIcsevrCsmcARPzMKbWMEGsU2V xrXzmL4dwwLrHQ2Brwo5sNZFmmF2GfJ88JUnV33ZCEQgsuC4ipqjZ1QxYy+V+HSI3puv 2UU8g2HIl2mh8VGzf398WqwPgIaY1e59cxMlwc74yEXGYjuy1Fm0VTJZ4YrA9WAND+b6 nZCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=EvLxzuSR; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id r16-20020a170906549000b009a1f53509adsi3172873ejo.27.2023.09.15.07.14.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 07:14:36 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=EvLxzuSR; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9BD2C3857C41 for ; Fri, 15 Sep 2023 14:14:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9BD2C3857C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694787274; bh=DLKj+mHnQEM0uKU2bYW1fKHdZpjZkHirJYDhc6ktVNI=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=EvLxzuSRYk4zHJ8VbAy6CSd7bqIHKgJi41s6cXbR9Key6qe4J57UMXRZMQcIuLxbW pikn0FcYvtHealEa4ZjeZByWLFGY0IFQQQgfpogi4hohiwbFzd9htZFibtRzBmY32w M/riE4OdWE6gfo7Mbih8/ry4LJnJlIk1otZ0bVDw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5E1B93858C52 for ; Fri, 15 Sep 2023 14:13:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5E1B93858C52 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-658-HLu07RC-PZC3ZmgQ5iqaZA-1; Fri, 15 Sep 2023 10:13:50 -0400 X-MC-Unique: HLu07RC-PZC3ZmgQ5iqaZA-1 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-76ef03effdcso278035685a.2 for ; Fri, 15 Sep 2023 07:13:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694787229; x=1695392029; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ye7+meZg9XVopUScXqev20sEVlAELQwLs6rR16gzmAY=; b=IzunNWiaYN561+pBClnkYr45EWw+E9lC2NYLwJuHsYDWateecBGfB8ZROBp01jwokl oDtJki6FhPpMak6t98UtQkeZ5JW9q1TZskyxRe5niL7c06k4z0RlBAn5o0q5HXms1jfE AWd5/Tb+2mKm27ZF1C4FOL2WW3ZioayVLJPnL7VteTE1OZysI9YG57EFqh87U7xEDcZv hMmNQpTUS1trgJ4pVGCWauZuV2eYCrwfG1EgUgqCOSg+AtvZ02SNDnJflNrTJ99HQnBm yC6PaadKJdMMR/orKVSqkaYK6490Bii6rUT7GkguXB8qH6LmD86zCP4qNaUV2XjZAZBb aP/w== X-Gm-Message-State: AOJu0YxtYw+FPQVtwNtxo8n1BulbnucCurX39LtIe/gveGJ7ts8KEMfI Yth/+ZFdp0Nzrj7XTccC8Po4CqVOWHa0XmsRWYvlvNjsiATmGLr8T17AWBgiZs5ZtIfHlS6hLoB 9POVSzk0jjSls7pSZUURvhqONoRyWzc7RDawuUEoG6oqcuxhrmpK27ZSLvVvV3u8rNYMGASr2Ar EKGQ== X-Received: by 2002:a05:620a:472c:b0:772:63b4:3804 with SMTP id bs44-20020a05620a472c00b0077263b43804mr1919882qkb.56.1694787229700; Fri, 15 Sep 2023 07:13:49 -0700 (PDT) X-Received: by 2002:a05:620a:472c:b0:772:63b4:3804 with SMTP id bs44-20020a05620a472c00b0077263b43804mr1919856qkb.56.1694787229384; Fri, 15 Sep 2023 07:13:49 -0700 (PDT) Received: from ?IPV6:2605:8d80:5e0:23ed:dc0e:d72:28b1:179f? ([2605:8d80:5e0:23ed:dc0e:d72:28b1:179f]) by smtp.gmail.com with ESMTPSA id i3-20020a37c203000000b00765aa3ffa07sm1250258qkm.98.2023.09.15.07.13.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Sep 2023 07:13:48 -0700 (PDT) Message-ID: <2e741213-66e4-fbc5-41ec-4b7e0c8b4844@redhat.com> Date: Fri, 15 Sep 2023 10:13:47 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 To: gcc-patches Cc: "hernandez, aldy" Subject: [COMMITTED 1/2] Fix indentation in range_of_phi. X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrew MacLeod via Gcc-patches From: Andrew MacLeod Reply-To: Andrew MacLeod Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777113262497074246 X-GMAIL-MSGID: 1777113262497074246 Somewhere along the way a large sequence of code in range_of_phi() ended up with the same indentation of the preceeding loop.. this simply fixes it. committed as obvious. Andrew From e35c3b5335879afb616c6ead0f41bf6c275ee941 Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Wed, 13 Sep 2023 09:58:39 -0400 Subject: [PATCH 1/3] Fix indentation. No functio0nal change, indentation was incorrect. * gimple-range-fold.cc (fold_using_range::range_of_phi): Fix indentation. --- gcc/gimple-range-fold.cc | 80 ++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index 8ebff7f5980..03805d88d9b 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -898,46 +898,46 @@ fold_using_range::range_of_phi (vrange &r, gphi *phi, fur_source &src) break; } - // If all arguments were equivalences, use the equivalence ranges as no - // arguments were processed. - if (r.undefined_p () && !equiv_range.undefined_p ()) - r = equiv_range; - - // If the PHI boils down to a single effective argument, look at it. - if (single_arg) - { - // Symbolic arguments can be equivalences. - if (gimple_range_ssa_p (single_arg)) - { - // Only allow the equivalence if the PHI definition does not - // dominate any incoming edge for SINGLE_ARG. - // See PR 108139 and 109462. - basic_block bb = gimple_bb (phi); - if (!dom_info_available_p (CDI_DOMINATORS)) - single_arg = NULL; - else - for (x = 0; x < gimple_phi_num_args (phi); x++) - if (gimple_phi_arg_def (phi, x) == single_arg - && dominated_by_p (CDI_DOMINATORS, - gimple_phi_arg_edge (phi, x)->src, - bb)) - { - single_arg = NULL; - break; - } - if (single_arg) - src.register_relation (phi, VREL_EQ, phi_def, single_arg); - } - else if (src.get_operand (arg_range, single_arg) - && arg_range.singleton_p ()) - { - // Numerical arguments that are a constant can be returned as - // the constant. This can help fold later cases where even this - // constant might have been UNDEFINED via an unreachable edge. - r = arg_range; - return true; - } - } + // If all arguments were equivalences, use the equivalence ranges as no + // arguments were processed. + if (r.undefined_p () && !equiv_range.undefined_p ()) + r = equiv_range; + + // If the PHI boils down to a single effective argument, look at it. + if (single_arg) + { + // Symbolic arguments can be equivalences. + if (gimple_range_ssa_p (single_arg)) + { + // Only allow the equivalence if the PHI definition does not + // dominate any incoming edge for SINGLE_ARG. + // See PR 108139 and 109462. + basic_block bb = gimple_bb (phi); + if (!dom_info_available_p (CDI_DOMINATORS)) + single_arg = NULL; + else + for (x = 0; x < gimple_phi_num_args (phi); x++) + if (gimple_phi_arg_def (phi, x) == single_arg + && dominated_by_p (CDI_DOMINATORS, + gimple_phi_arg_edge (phi, x)->src, + bb)) + { + single_arg = NULL; + break; + } + if (single_arg) + src.register_relation (phi, VREL_EQ, phi_def, single_arg); + } + else if (src.get_operand (arg_range, single_arg) + && arg_range.singleton_p ()) + { + // Numerical arguments that are a constant can be returned as + // the constant. This can help fold later cases where even this + // constant might have been UNDEFINED via an unreachable edge. + r = arg_range; + return true; + } + } bool loop_info_p = false; // If SCEV is available, query if this PHI has any known values. -- 2.41.0