From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id B393B3857827; Mon, 16 May 2022 08:44:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B393B3857827 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-496] [Ada] Don't crash on ghost packages when emitting CUDA symbols in ALI files X-Act-Checkin: gcc X-Git-Author: Ghjuvan Lacambre X-Git-Refname: refs/heads/master X-Git-Oldrev: f29e9e88965ade628873182a866bb26830994217 X-Git-Newrev: 9eb55045f8d22919c47b38809afbcad7ad9a38d5 Message-Id: <20220516084443.B393B3857827@sourceware.org> Date: Mon, 16 May 2022 08:44:43 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2022 08:44:43 -0000 https://gcc.gnu.org/g:9eb55045f8d22919c47b38809afbcad7ad9a38d5 commit r13-496-g9eb55045f8d22919c47b38809afbcad7ad9a38d5 Author: Ghjuvan Lacambre Date: Mon Mar 14 09:58:52 2022 +0100 [Ada] Don't crash on ghost packages when emitting CUDA symbols in ALI files Before this commit, a GNAT compiled with assertions would crash when attempting to emit CUDA symbols in ALI files for spark_mode/ghost packages, whose content is a single null statement. gcc/ada/ * lib-writ.adb (Output_CUDA_Symbols): Check for null packages. Diff: --- gcc/ada/lib-writ.adb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/ada/lib-writ.adb b/gcc/ada/lib-writ.adb index 556df9a7b73..b525bbac0f5 100644 --- a/gcc/ada/lib-writ.adb +++ b/gcc/ada/lib-writ.adb @@ -403,7 +403,9 @@ package body Lib.Writ is Kernel_Elm : Elmt_Id; Kernel : Entity_Id; begin - if not Enable_CUDA_Expansion then + if not Enable_CUDA_Expansion + or else Nkind (Unit_Id) = N_Null_Statement + then return; end if; Spec_Id := (if Nkind (Unit_Id) = N_Package_Body