From patchwork Tue Dec 15 11:42:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1416395 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=adacore.com 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 4CwGbh1rfVz9sRR for ; Tue, 15 Dec 2020 22:43:11 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C2A98384A881; Tue, 15 Dec 2020 11:42:47 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id 115A0384B438 for ; Tue, 15 Dec 2020 11:42:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 115A0384B438 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id ACB325615D; Tue, 15 Dec 2020 06:42:41 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com 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 YLrjSxsZeXpn; Tue, 15 Dec 2020 06:42:41 -0500 (EST) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 99C8356156; Tue, 15 Dec 2020 06:42:41 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4862) id 9866C8F; Tue, 15 Dec 2020 06:42:41 -0500 (EST) Date: Tue, 15 Dec 2020 06:42:41 -0500 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Subject: [Ada] Mark generic body outside of SPARK Message-ID: <20201215114241.GA35231@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, 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: , Cc: Yannick Moy Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" New body for Ada.Text_IO.Float_IO makes explicit use of Long_Long_Float which is not supported by GNATprove for now. Exclude that generic body from SPARK explicitly so that the unit can be instantiated from SPARK code. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * libgnat/a-tiflio.adb: Mark body not in SPARK. * libgnat/a-tiflio.ads: Mark spec in SPARK. diff --git a/gcc/ada/libgnat/a-tiflio.adb b/gcc/ada/libgnat/a-tiflio.adb --- a/gcc/ada/libgnat/a-tiflio.adb +++ b/gcc/ada/libgnat/a-tiflio.adb @@ -31,7 +31,7 @@ with Ada.Text_IO.Float_Aux; -package body Ada.Text_IO.Float_IO is +package body Ada.Text_IO.Float_IO with SPARK_Mode => Off is package Aux renames Ada.Text_IO.Float_Aux; diff --git a/gcc/ada/libgnat/a-tiflio.ads b/gcc/ada/libgnat/a-tiflio.ads --- a/gcc/ada/libgnat/a-tiflio.ads +++ b/gcc/ada/libgnat/a-tiflio.ads @@ -43,7 +43,7 @@ private generic type Num is digits <>; -package Ada.Text_IO.Float_IO is +package Ada.Text_IO.Float_IO with SPARK_Mode => On is Default_Fore : Field := 2; Default_Aft : Field := Num'Digits - 1;