From patchwork Fri Nov 4 16:53:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 691327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t9Sbk02dhz9vFL for ; Sat, 5 Nov 2016 03:54:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="m4Zg784T"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=MdmXS6vV+lwUkPrEp/Ra2hcw1VDWXVTMDwXAKKRQxOcAJDtrIK NuwHuqh8TsKNIFPR1k7wPcaMM4UzhbmBArPT3dFQkO1+fqUvRLuZDKwkxAsNN0l0 nad2kq3MQBz5hGXGLVHb0XIybMLpjlPmUSoqBRnzLtMV7NMXnXhk2sFXE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=msmiD93VRSoH//kURJSGz9ePGvA=; b=m4Zg784Tlt2Da1A0O7mN 7TTI76L2GkXfBqpUVjAi1S1UKm85RtoORReD0UY1+bIlg0qqwmqyb7b92JJ/Wocj iGxzcYlrUpB0Csr+AYDaRU9QnulQ5dCBQzZxHgjMHUanS4sTfXx08P2+TbNW9EhR LA8rxpC8RHIqKLDyFxWGxYs= Received: (qmail 66714 invoked by alias); 4 Nov 2016 16:54:01 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 66688 invoked by uid 89); 4 Nov 2016 16:54:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS autolearn=ham version=3.3.2 spammy=sk:!operan, sk:operan, size_type, Hx-languages-length:1444 X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 04 Nov 2016 16:53:50 +0000 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 66C49AC72 for ; Fri, 4 Nov 2016 16:53:48 +0000 (UTC) Date: Fri, 4 Nov 2016 17:53:47 +0100 From: Martin Jambor To: GCC Patches Cc: Jan Hubicka Subject: [PATCH] Remove a FIXME from verify_type_variant Message-ID: <20161104165347.gigf2rtr5vnmuqdl@virgil.suse.cz> Mail-Followup-To: GCC Patches , Jan Hubicka MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.2 (2016-07-01) X-IsSubscribed: yes Hi, now that we removed java, let us check whether the FIXME this removes (and that was added by Honza) is actually true. It only affects checking runs and if it turns out to be false, we can easily revert this. Bootstrapped, LTO-bootstrapped and tested on x86_64-linux and aarch64-linux, OK for trunk? Thanks, Martin 2016-11-03 Martin Jambor * tree.c (verify_type_variant): Use pointer comparison to check that TYPE_SIZE_UNIT match. --- gcc/tree.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gcc/tree.c b/gcc/tree.c index 56cc653..10fc70d 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -13272,12 +13272,10 @@ verify_type_variant (const_tree t, tree tv) verify_variant_match (TYPE_SIZE); if (TREE_CODE (TYPE_SIZE_UNIT (t)) != PLACEHOLDER_EXPR && TREE_CODE (TYPE_SIZE_UNIT (tv)) != PLACEHOLDER_EXPR - && TYPE_SIZE_UNIT (t) != TYPE_SIZE_UNIT (tv) - /* FIXME: ideally we should compare pointer equality, but java FE - produce variants where size is INTEGER_CST of different type (int - wrt size_type) during libjava biuld. */ - && !operand_equal_p (TYPE_SIZE_UNIT (t), TYPE_SIZE_UNIT (tv), 0)) + && TYPE_SIZE_UNIT (t) != TYPE_SIZE_UNIT (tv)) { + gcc_assert (!operand_equal_p (TYPE_SIZE_UNIT (t), + TYPE_SIZE_UNIT (tv), 0)); error ("type variant has different TYPE_SIZE_UNIT"); debug_tree (tv); error ("type variant's TYPE_SIZE_UNIT");