From patchwork Fri Nov 13 22:44:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hubicka X-Patchwork-Id: 1400173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ucw.cz Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CXtrv0L6qz9sPB for ; Sat, 14 Nov 2020 09:47:27 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 19601395383F; Fri, 13 Nov 2020 22:47:24 +0000 (GMT) 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 7550C3854802 for ; Fri, 13 Nov 2020 22:47:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7550C3854802 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ucw.cz Authentication-Results: sourceware.org; spf=none smtp.mailfrom=hubicka@kam.mff.cuni.cz Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id 9CDDF283CF7; Fri, 13 Nov 2020 23:47:19 +0100 (CET) Resent-From: Jan Hubicka Resent-Date: Fri, 13 Nov 2020 23:47:19 +0100 Resent-Message-ID: <20201113224719.GC1667@kam.mff.cuni.cz> Resent-To: gcc-patches@gcc.gnu.org Date: Fri, 13 Nov 2020 23:44:39 +0100 From: Jan Hubicka To: gcc-pathces@gcc.gnu.org Subject: Revert accidentally comitted sanity check Message-ID: <20201113224439.GA79433@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=-15.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, I have accidentally comitted in the following sanity check that fails and is discussed in https://gcc.gnu.org/pipermail/gcc-patches/2020-November/558538.html The current ipa-icf code is conservatively correct because alias_ptr_types_compatible_p returns false on ref_all_alias_ptr_type_p. Comitted as obvious. I apologize for the breakage, Honza * tree-ssa-alias.c (ao_ref_base_alias_ptr_type, ao_ref_alias_ptr_type): Revert accidental commit diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index 9f279c805e5..5ebbb087285 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -755,7 +755,6 @@ ao_ref_base_alias_ptr_type (ao_ref *ref) while (handled_component_p (base_ref)) base_ref = TREE_OPERAND (base_ref, 0); tree ret = reference_alias_ptr_type (base_ref); - gcc_checking_assert (get_deref_alias_set (ret) == ao_ref_base_alias_set (ref)); return ret; } @@ -768,7 +767,6 @@ ao_ref_alias_ptr_type (ao_ref *ref) if (!ref->ref) return NULL_TREE; tree ret = reference_alias_ptr_type (ref->ref); - gcc_checking_assert (get_deref_alias_set (ret) == ao_ref_alias_set (ref)); return ret; }