From patchwork Mon May 16 08:43:16 2022 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: 54019 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4787F385741A for ; Mon, 16 May 2022 09:04:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4787F385741A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652691876; bh=nPMv4e3QnOWxVZn/04dJ9Z/TrvfKSaT43xc59j52Rw0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=nLvhdWeiOBHJTYwm51Tta8ZJQEwjbIz51ldVLrIZhrKINw82idQoApN37slhrXkHK 6LQIkGa8W288sD3xfmO97Lp15DcHEQaUjctM99bRP82ldqn5/U7/LXwaT4qmu3o3Se folsseFYnsZ1Rk8YqbqFZGW6dK/CuQX1V4ZcZBP4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id B387B3857822 for ; Mon, 16 May 2022 08:43:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B387B3857822 Received: by mail-wm1-x32f.google.com with SMTP id c190-20020a1c35c7000000b0038e37907b5bso10465321wma.0 for ; Mon, 16 May 2022 01:43:18 -0700 (PDT) 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=nPMv4e3QnOWxVZn/04dJ9Z/TrvfKSaT43xc59j52Rw0=; b=e1I8e9YJ2EMV3inbn26aF9EfS4tgB++yqnwdz8qaac4fbyVwnXId4mRfSaTiFRgyUk qze1SACMcB/jYMbKTj+lBuEL+b4i/lm5QhrN5wCQfLk5PhrOd0jdVeMq55X9woBsc+1z h5OPX3XmHQGUdMgnSR5uj+MFwzpGUiG0g+Q1CtGZA47pUVvdTX2ws/iOnlTNTVoNF9xv BBiVLcnsouFD9AUC/Jh1XIjWecqB/V3gAkYurgjw72qYgMsjp5nxMaumGzPwEAf4q8rK gxbZdToDd928LIgKjaEvsyssNNxn/PzruGtSRr8IPBx67us5AuegJkUp/9S+swnc2Ls4 Xs3w== X-Gm-Message-State: AOAM531JTnexuVBm/jFnY5DAhz62judRSQBW158gpbQYH3gteYBE1uW9 GsNOqQ3uwj83PI9ZOISp9NY0dF3BUTguAA== X-Google-Smtp-Source: ABdhPJwcKbX0Aa6lfH+NkxalY9QKj28f+2hpfF/c+P+nBu2riacoGZgcDrGknYFFWAX7ezF0tMO+Nw== X-Received: by 2002:a7b:c842:0:b0:394:8d6c:2768 with SMTP id c2-20020a7bc842000000b003948d6c2768mr15722774wml.205.1652690597551; Mon, 16 May 2022 01:43:17 -0700 (PDT) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id a21-20020a05600c225500b00395b809dfd3sm10099634wmm.12.2022.05.16.01.43.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 01:43:17 -0700 (PDT) Date: Mon, 16 May 2022 08:43:16 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Don't crash on ghost packages when emitting CUDA symbols in ALI files Message-ID: <20220516084316.GA3843744@adacore.com> MIME-Version: 1.0 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Ghjuvan Lacambre Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" 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. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * lib-writ.adb (Output_CUDA_Symbols): Check for null packages. diff --git a/gcc/ada/lib-writ.adb b/gcc/ada/lib-writ.adb --- 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