From patchwork Thu Apr 25 10:48:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 239486 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id CBA4D2C00C7 for ; Thu, 25 Apr 2013 20:48:26 +1000 (EST) 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=n6AUjC0wFHjYXKIAS5hTemh0Jc0ZUixVTa+Qod1sra6NCGDZ2G xnb4lDHNmUzBWfsGarQfNOLhVYM0l7VhZ5zqLA/+WISHrdopOQ7xnuiSaHTEXXYx FNqpIS5FKk6A2rD1diFZz+kX2pfpfWEl1MC9RQNRMv1B9FuDHFDeYZwGg= 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=M36y94zJH+7HyWuSAmRLgBAQXJs=; b=s/B8jpa5oq5BthHFKJPw mk2KWPxdVimi6JPzYiyf2HgVE8uSmq8ahy1fSIbyUwUVhGeAcH8/v65CFvUjD0LP 8qoIJY/eY7Sn+/kX5eKmdZTWwOMsZkG5ToIVXcH5uLioxQ2JpUdRNrztkj+3UZYM 4Wsie0Hk2Lh664KbFVjv8qU= Received: (qmail 17706 invoked by alias); 25 Apr 2013 10:48:19 -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 17694 invoked by uid 89); 25 Apr 2013 10:48:18 -0000 X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_NO autolearn=ham version=3.3.1 Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 25 Apr 2013 10:48:17 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 7DB151C7AA2; Thu, 25 Apr 2013 06:48:15 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id brKjS5VYKp+E; Thu, 25 Apr 2013 06:48:15 -0400 (EDT) Received: from kwai.gnat.com (kwai.gnat.com [205.232.38.4]) by rock.gnat.com (Postfix) with ESMTP id 56D5A1C79E1; Thu, 25 Apr 2013 06:48:15 -0400 (EDT) Received: by kwai.gnat.com (Postfix, from userid 4192) id 4E95A3FF09; Thu, 25 Apr 2013 06:48:15 -0400 (EDT) Date: Thu, 25 Apr 2013 06:48:15 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Yannick Moy Subject: [Ada] Remove special expansion for membership tests in SPARK mode Message-ID: <20130425104815.GA14342@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Virus-Found: No We now deal directly in the formal verification back-end with complex membership tests, so this special expansion is useless and can be removed. Tested on x86_64-pc-linux-gnu, committed on trunk 2013-04-25 Yannick Moy * exp_spark.adb (Expand_SPARK_N_In): Remove procedure. (Expand_SPARK): Remove special expansion for membership tests. Index: exp_spark.adb =================================================================== --- exp_spark.adb (revision 198234) +++ exp_spark.adb (working copy) @@ -30,7 +30,6 @@ with Exp_Ch6; use Exp_Ch6; with Exp_Dbug; use Exp_Dbug; with Exp_Util; use Exp_Util; -with Nlists; use Nlists; with Rtsfind; use Rtsfind; with Sem_Aux; use Sem_Aux; with Sem_Res; use Sem_Res; @@ -55,9 +54,6 @@ procedure Expand_SPARK_N_Attribute_Reference (N : Node_Id); -- Expand attributes 'Old and 'Result only - procedure Expand_SPARK_N_In (N : Node_Id); - -- Expand set membership into individual ones - procedure Expand_SPARK_N_Object_Renaming_Declaration (N : Node_Id); -- Perform name evaluation for a renamed object @@ -102,9 +98,6 @@ N_Identifier => Expand_Potential_Renaming (N); - when N_In => - Expand_SPARK_N_In (N); - -- A NOT IN B gets transformed to NOT (A IN B). This is the same -- expansion used in the normal case, so shared the code. @@ -204,17 +197,6 @@ end case; end Expand_SPARK_N_Attribute_Reference; - ----------------------- - -- Expand_SPARK_N_In -- - ----------------------- - - procedure Expand_SPARK_N_In (N : Node_Id) is - begin - if Present (Alternatives (N)) then - Expand_Set_Membership (N); - end if; - end Expand_SPARK_N_In; - ------------------------------------------------ -- Expand_SPARK_N_Object_Renaming_Declaration -- ------------------------------------------------