From patchwork Mon Jan 31 10:47:32 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: 1586599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=rCF1pmSx; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JnPtP25PCz9s8q for ; Mon, 31 Jan 2022 21:48:27 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ED47D385802B for ; Mon, 31 Jan 2022 10:48:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ED47D385802B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1643626105; bh=aSIWsa/BlEWUbIL4b55MFQkUqt0YYVQVJCFEWvSVqog=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rCF1pmSxULrejUNYBPBDMu9zflsLpZHJXk2yG2cwDMbIa1XupyQzOfHa1VN4sXXcr hBtGtV99wxNQAROULV4yGaTgN5AJWOl4kkASsBwunbwI84159AhlWt7CZpPrpjoZVn YRpOdm0/AdCRkfeoWnvbj2gBpJjftbIR69lPEtAM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 63565385841D for ; Mon, 31 Jan 2022 10:47:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 63565385841D Received: by mail-wr1-x42f.google.com with SMTP id l25so24449458wrb.13 for ; Mon, 31 Jan 2022 02:47:35 -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=aSIWsa/BlEWUbIL4b55MFQkUqt0YYVQVJCFEWvSVqog=; b=vBbCet2T1DdZKDD6RGFi5l56GCcVJL6P2zPs5WeDrChNeyC61oNc7zcQlaySBIl5yJ 5/EyOtTTovmdWCdtXfPmBLYVLfV5WIoqKj8M/CsVbWPDVn1gZIghdYmj3ee/hM2V2Ycp GlURxM+OhWGM61lQd5I0an1hFqYpar3Wq0AJJ5XtdDxlMV8X4/husAdML6xuEymr7ude 5f8N3HmbvD2Fd2FBBIUlJfBT6AI095G/dlmJmclPIo6R8TfY4/1w1+/ouu7oriN5R2WS 7tj3Dk9vZddJNoiGFHc2o62UD5hO94z7InJP9KJlAxXItSIBc6iFJTAKTrEM0ZnHfVdU db1w== X-Gm-Message-State: AOAM533mu9SGAtxdg99+TN1mddGvdmYOeGMvFBpMFnCa3vULeLRINgh6 jx6GxEZNhV8wlHwWwU8RrDL9Gag7o2bZZA== X-Google-Smtp-Source: ABdhPJyK0ncVZjfD6FAPoOQ59iN+YXYvt325kci2mtTbRBnJYCYg60TfbytaHDJOOdSrpE/CQuoimw== X-Received: by 2002:a05:6000:4d:: with SMTP id k13mr17027024wrx.625.1643626054198; Mon, 31 Jan 2022 02:47:34 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id m11sm8183831wmi.16.2022.01.31.02.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jan 2022 02:47:33 -0800 (PST) Date: Mon, 31 Jan 2022 10:47:32 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Fix up handling of ghost units PR104027 #2 Message-ID: <20220131104732.GA2682710@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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-Patchwork-Original-From: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The previous change was short-circuiting too much, the regular processing (in particular writing ALI files) was bypassed, causing troubles with e.g. gnatmake or gprbuild down the road. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ PR ada/104027 * gnat1drv.adb (Gnat1drv): Only call Exit_Program when not generating code, otherwise instead go to End_Of_Program. diff --git a/gcc/ada/gnat1drv.adb b/gcc/ada/gnat1drv.adb --- a/gcc/ada/gnat1drv.adb +++ b/gcc/ada/gnat1drv.adb @@ -1504,11 +1504,19 @@ begin Namet.Finalize; Check_Rep_Info; - -- Exit the driver with an appropriate status indicator. This will - -- generate an empty object file for ignored Ghost units, otherwise - -- no object file will be generated. + if Ecode /= E_Success then + -- If we cannot generate code, exit the driver with an appropriate + -- status indicator. - Exit_Program (Ecode); + Exit_Program (Ecode); + + else + -- Otherwise use a goto so that finalization occurs normally and + -- for instance any late processing in the GCC code can be + -- performed. + + goto End_Of_Program; + end if; end if; -- In -gnatc mode we only do annotation if -gnatR is also set, or if