From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 96E793857C78 for ; Fri, 7 Jan 2022 16:27:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 96E793857C78 Received: by mail-wr1-x435.google.com with SMTP id t28so5289602wrb.4 for ; Fri, 07 Jan 2022 08:27:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=Me6cnEuw49RkPCnF9TUTJ/DVnL61Iyj/phpt1+RZP54=; b=c7uvhdRjp7zVI5v27yl7L4acx7haT+e949Fcw4VuO4oeQr6ay2N/5llSAKWLIbKBdN QsMmTo2trOJgOwVn3nCOTJkGiLvK86zrADUFmbZWvsO+3WXUVrmUPzDsBZ5lPVbxXU2R wR1b8ehDcG4+Xdq6XVADwyvNqHbqvHHYOFLKD9xGldGd7dXLKMIdDfQRmLApv7cDHIAL LtVxoXm0NXlBP7Hsl9D65hTQis6JCToSnMEz+7XZuoUwwJZeGxDNynQ4odRMPENiFx6K ouVFOt5g21FzULEDlnwJq7zy2zDQEwe5/458hyPy3WRIdTrCchC4Ebga2dB3SKLvPAcy orZw== X-Gm-Message-State: AOAM531bYqSqIoF+xIw0aeRv5elKAgrouBJWh0TYsWq/zePMPeHAxcBq ZTd5K98sBtDsNH+pKyckN8b/RUSIw8uM4w== X-Google-Smtp-Source: ABdhPJxYvyBdUnSv4iVUrFBCPNV/6+BTk1LLBpDgcZt3ny/PHHcPNwYz2DQ5kcDOyf+PeBwKJvKg9A== X-Received: by 2002:adf:ea4a:: with SMTP id j10mr8115337wrn.275.1641572845687; Fri, 07 Jan 2022 08:27:25 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id p18sm10205032wmq.0.2022.01.07.08.27.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 08:27:24 -0800 (PST) Date: Fri, 7 Jan 2022 16:27:24 +0000 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [Ada] Fix layout of pragma Inline in generated AST unit Message-ID: <20220107162724.GA948882@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="sm4nu43k4a2Rpi4c" Content-Disposition: inline X-Spam-Status: No, score=-13.2 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: , X-List-Received-Date: Fri, 07 Jan 2022 16:27:27 -0000 --sm4nu43k4a2Rpi4c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Make the generated nmake.ads unit look more like it was written with GNAT style rules in mind; semantics is unaffected. Cleanup related to fix of default initialization in multi-dimensional arrays, which used to explicitly call the Nmake.Make_Null routine. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * gen_il-gen.adb (Put_Make_Decls): Put pragma Inline in a dedicated line, so that the current indentation is taken into account. --sm4nu43k4a2Rpi4c Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/gen_il-gen.adb b/gcc/ada/gen_il-gen.adb --- a/gcc/ada/gen_il-gen.adb +++ b/gcc/ada/gen_il-gen.adb @@ -2472,7 +2472,8 @@ package body Gen_IL.Gen is for T in First_Concrete (Root) .. Last_Concrete (Root) loop if T not in N_Unused_At_Start | N_Unused_At_End then Put_Make_Spec (S, Root, T); - Put (S, ";" & LF & "pragma " & Inline & " (Make_" & + Put (S, ";" & LF); + Put (S, "pragma " & Inline & " (Make_" & Image_Sans_N (T) & ");" & LF & LF); end if; end loop; --sm4nu43k4a2Rpi4c--