From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 0B8CE385841A for ; Mon, 14 Nov 2022 13:52:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0B8CE385841A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x433.google.com with SMTP id k8so18399872wrh.1 for ; Mon, 14 Nov 2022 05:52:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=IKOKuETYxQIh4s0e8Tte6bF/cH3qDt5nSTyugh/pBYU=; b=eW8dumVKU5HrRTLkPXFPP2rw+NIKGyIJZ8m+rheMMtkBDxdHdEhuaaMUfUX4oBvKJE duvnTS/v4B3LAWDBG9Gu/wJOWIWpv8Z5pcm80Tkd+MFbL2MgFMtK+eCGf95g/31m/K3S l283+1/r6ZhX4Quj8H0PfcSCDJxzTiN9D8qou8xUUMvwyA73HfbqAPMdCuzosRM4Gumo n4ojQLmURT7ldvlXcEZ79Oz25iB+I+Scxlol5WedASIz5lEGqGbOuzri0uKtCJqLBcMI czfqSzSrB1iQJ1cs/RB58RrSIknzHingXWROKCk84rpBvOMQtPThbCw8ilFh4XIjs0p8 6Vtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IKOKuETYxQIh4s0e8Tte6bF/cH3qDt5nSTyugh/pBYU=; b=W7l7VG8jfnEju/TlfqRsqAstl2LokCsPJXtRbjYThtONUOVJOTKOJwKJV4VR/f5A+/ iepBpbO60sgxAUjHBBHWKT3n8T+3PMNh0WhZBt2YLpelm3+cVaK/vhm1u29kF3gLIawS KRy23za+OkUYCXXhwJEM8iLbc4ZJXK7CPB0kuEEjzK7LhMlKBHwPfkgw9mm0ajikO8xP neokmdT+s4R1ImyMnXaJfTqIhuR6k9/OeNXYOhKfttRpf3IXfcCEjlcsgZRQfH80tj3X bFlt/BVilGSbSsYH5qBRdiEwdQB5JHv/w/kM6nI46KDTYGA0RRwjRHiLTugnrHaMU+by abgw== X-Gm-Message-State: ANoB5pl90Tq53hbFyqcbKl9Gq+TluNJObq9JAgkUCDXIiCa5mVJu2D0z J0CA8AlUWsdfIy9effdr//6bwJQHFTifrw== X-Google-Smtp-Source: AA0mqf5O0akR3UfVNQkpJZgKjCA4T3u2eoa4b+2w2YM2Od/g+jAG7QrsTUO6372KkOuZceh3Yzw7FQ== X-Received: by 2002:a5d:4b0c:0:b0:236:6101:7b7d with SMTP id v12-20020a5d4b0c000000b0023661017b7dmr7404861wrq.484.1668433924779; Mon, 14 Nov 2022 05:52:04 -0800 (PST) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id bt17-20020a056000081100b0023677e1157fsm9772014wrb.56.2022.11.14.05.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Nov 2022 05:52:04 -0800 (PST) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Expand generic formal subprograms with contracts for GNATprove Date: Mon, 14 Nov 2022 14:52:02 +0100 Message-Id: <20221114135202.52712-1-poulhies@adacore.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Piotr Trojanek In GNATprove mode generic formal subprograms with Pre/Post contracts are now expanded into wrappers, just like in ordinary compilation. gcc/ada/ * sem_ch12.adb (Analyze_Associations): Expand wrappers for GNATprove. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch12.adb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index 276656085be..7af365e49c9 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -1937,7 +1937,7 @@ package body Sem_Ch12 is -- take place e.g. within an enclosing generic unit. if Has_Contracts (Analyzed_Formal) - and then Expander_Active + and then (Expander_Active or GNATprove_Mode) then Build_Subprogram_Wrappers; end if; -- 2.34.1