From patchwork Mon Oct 11 20:00:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hubicka X-Patchwork-Id: 46113 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 28E18385803B for ; Mon, 11 Oct 2021 20:01:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 28E18385803B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1633982484; bh=+/ZSF+8tS68tPJU/vYAw+EImyiR3CMu6B6WtHykuzyw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=RGLqskfrqGf3ryl17GWw32p2T/1S8I7MaTvgTvYpyChP7kq6QN4/7o6jrto7i5QQM 3dMs1KKOUqEUxyvqput+MIEgCQdOUeXYGPy6pnIiWzv9wCa9I8BqiWRwGDwFs+lkh0 oXPR9Af3YwgrKEzCn1eVJd7wfmwlROS83NXtyYXs= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from nikam.ms.mff.cuni.cz (nikam.ms.mff.cuni.cz [195.113.20.16]) by sourceware.org (Postfix) with ESMTPS id 1A65C3858409 for ; Mon, 11 Oct 2021 20:00:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1A65C3858409 Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id E7A2728061A; Mon, 11 Oct 2021 22:00:48 +0200 (CEST) Date: Mon, 11 Oct 2021 22:00:48 +0200 To: gcc-patches@gcc.gnu.org Subject: Revert accidental change in ipa-modref-tree.h Message-ID: <20211011200048.GA23986@kam.mff.cuni.cz> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Jan Hubicka via Gcc-patches From: Jan Hubicka Reply-To: Jan Hubicka Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi, I managed to commit an unrelatd change that was sitting my tree that breaks bootstrap. I have reverted it now and checked bootstrap gets past the failing point (still waiting for full bootstrap®test to finish at x86_64-linux). Honza gcc/ChangeLog: * ipa-modref-tree.h (struct modref_access_node): Revert accidental change. (struct modref_ref_node): Likewise. diff --git a/gcc/ipa-modref-tree.h b/gcc/ipa-modref-tree.h index 52f225b1aae..9795e2b8405 100644 --- a/gcc/ipa-modref-tree.h +++ b/gcc/ipa-modref-tree.h @@ -148,8 +148,7 @@ struct GTY(()) modref_access_node poly_int64 offset1, poly_int64 size1, poly_int64 max_size1, bool record_adjustments) { - if (known_eq (parm_offset, parm_offset1) - && known_eq (offset, offset1) + if (known_eq (offset, offset1) && known_eq (size, size1) && known_eq (max_size, max_size1)) return; @@ -578,10 +577,6 @@ struct GTY((user)) modref_ref_node } (*accesses)[best1].forced_merge (best2 < 0 ? a : (*accesses)[best2], record_adjustments); - /* CHeck that merging indeed merged ranges. */ - gcc_checking_assert ((*accesses)[best1].contains (best2 < 0 ? a : (*accesses)[best2])); - /*if (best2 >= 0) - accesses->unordered_remove (best2);*/ if (!(*accesses)[best1].useful_p ()) { collapse ();