From patchwork Wed Mar 6 17:32:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Botcazou X-Patchwork-Id: 225559 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]) by ozlabs.org (Postfix) with SMTP id 5976F2C032F for ; Thu, 7 Mar 2013 04:34:55 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1363196095; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version: Content-Type:Content-Transfer-Encoding:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=Z/3yVCHN7Cu6ubtVhHvHpfOKgZk=; b=ps/RnkmWFZw+lfu iucuWA+M8dnVZ8HLkhFK4CpzNiAaVLj+WPxWv1mCIWNm+R12FAmTIVlLuDIKGIEu 7m4ViSTmMDcEx5D1XVF9j1xmPmyPKMe246lpTNBQchxmBIiwckhBOddCE7CAZJOY i03Zeal5Fpx5t9/qXA6qqKStbK0s= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:From:To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:Content-Transfer-Encoding:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=HXwO4CsHvpIsJ9ggVQzHZCUj8K5OL0iKyQh7qFypJUHSprQIeM1PQg4WJo+Fn3 WWAurSRzCUYNwWwX1CjOnWZYWc2JejeLsPdTxPW5VzWzwrgZCIAubmZWT6Lqbvzi R0Qk2nvNJBS/RHVde0a9KJpnlQACfRd/nPETkiQw0mGPw=; Received: (qmail 26701 invoked by alias); 6 Mar 2013 17:34:45 -0000 Received: (qmail 26261 invoked by uid 22791); 6 Mar 2013 17:34:43 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Mar 2013 17:34:11 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 9B6F7290083 for ; Wed, 6 Mar 2013 18:34:09 +0100 (CET) Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MsVaRPAcvqX1 for ; Wed, 6 Mar 2013 18:34:09 +0100 (CET) Received: from polaris.localnet (bon31-6-88-161-99-133.fbx.proxad.net [88.161.99.133]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mel.act-europe.fr (Postfix) with ESMTP id 78F1E290008 for ; Wed, 6 Mar 2013 18:34:09 +0100 (CET) From: Eric Botcazou To: gcc-patches@gcc.gnu.org Subject: [Ada] Minor tweak to emit_range_check Date: Wed, 06 Mar 2013 18:32:24 +0100 Message-ID: <8574087.7DkZdkjdiD@polaris> User-Agent: KMail/4.7.2 (Linux/3.1.10-1.16-desktop; KDE/4.7.2; x86_64; ; ) MIME-Version: 1.0 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 Just to stop the compiler properly instead of segfaulting on some ill-formed inputs going through the FE down to here. No functional changes. 2013-03-06 Eric Botcazou * gcc-interface/trans.c (emit_range_check): Assert that the range type is a numerical type and remove useless local variables. Index: gcc-interface/trans.c =================================================================== --- gcc-interface/trans.c (revision 196487) +++ gcc-interface/trans.c (working copy) @@ -8119,8 +8119,6 @@ static tree emit_range_check (tree gnu_expr, Entity_Id gnat_range_type, Node_Id gnat_node) { tree gnu_range_type = get_unpadded_type (gnat_range_type); - tree gnu_low = TYPE_MIN_VALUE (gnu_range_type); - tree gnu_high = TYPE_MAX_VALUE (gnu_range_type); tree gnu_compare_type = get_base_type (TREE_TYPE (gnu_expr)); /* If GNU_EXPR has GNAT_RANGE_TYPE as its base type, no check is needed. @@ -8128,6 +8126,10 @@ emit_range_check (tree gnu_expr, Entity_ if (gnu_compare_type == gnu_range_type) return gnu_expr; + /* Range checks can only be applied to types with ranges. */ + gcc_assert (INTEGRAL_TYPE_P (gnu_range_type) + || SCALAR_FLOAT_TYPE_P (gnu_range_type)); + /* If GNU_EXPR has an integral type that is narrower than GNU_RANGE_TYPE, we can't do anything since we might be truncating the bounds. No check is needed in this case. */ @@ -8147,13 +8149,16 @@ emit_range_check (tree gnu_expr, Entity_ (build_binary_op (TRUTH_ORIF_EXPR, boolean_type_node, invert_truthvalue (build_binary_op (GE_EXPR, boolean_type_node, - convert (gnu_compare_type, gnu_expr), - convert (gnu_compare_type, gnu_low))), + convert (gnu_compare_type, gnu_expr), + convert (gnu_compare_type, + TYPE_MIN_VALUE + (gnu_range_type)))), invert_truthvalue (build_binary_op (LE_EXPR, boolean_type_node, convert (gnu_compare_type, gnu_expr), convert (gnu_compare_type, - gnu_high)))), + TYPE_MAX_VALUE + (gnu_range_type))))), gnu_expr, CE_Range_Check_Failed, gnat_node); }