From patchwork Wed Dec 1 10:25:44 2021 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: 48338 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 99450385800C for ; Wed, 1 Dec 2021 10:39:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99450385800C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638355192; bh=NYrlgqE+ytIwAaVNKAgX0znuA89zNOkqm6p8077iSjw=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=P2gG2SHtMN2zcllrcZ6gQcvPGv/Fyn4BpxIM9CM5K6QKCSe1AFKr0SYdUaiZtVTIC ZzkjZt0OdWCNcn92hz+3HvUabh2A7ESOn/HUG9zekkM7726tn1V3zPoRBu03vCy0cc dCdvCE9swcl2UsclLmF2z4dv6G6B46yi0B6U7FgU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 4DCA0385802E for ; Wed, 1 Dec 2021 10:25:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4DCA0385802E Received: by mail-wm1-x329.google.com with SMTP id j140-20020a1c2392000000b003399ae48f58so21823823wmj.5 for ; Wed, 01 Dec 2021 02:25:47 -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=NYrlgqE+ytIwAaVNKAgX0znuA89zNOkqm6p8077iSjw=; b=pNJvLicoVjQ7y98HzPV/KZrI7h0PGwNKy9IxtKk7PEPcJyh+Py6gCMbdkesb1N+NMt wxSf6ga4z2lVve1ylOJL8ArO9fLkmdqe5jXJh8ScaFTAjHw/sXlsy8WaafO6FecGbts/ evrEeL2N+BcBncUcQNgImGFAnxebLeyxz7sHPGty89XYxCt4uoJGZN1V7REa8DXVZMW5 4dph9xTacuISrZQUiJZ0NE0Q4f7Y1WJ/Y5qv0ntgHIuZdvK6AkOcvdwo6P4Oetyqr2Y2 H1AV/HYSp01025bP2MDf7iV+HLkPviEL6kPsu0wlWkCClLaDL+ExMzYcimh7ESQDBdrk jw/Q== X-Gm-Message-State: AOAM532W+niDc4oQke/2eFelHhGdoBJdMmdMRGi8ytU9838mWhU81H/U 6oczYc+Xwbd+gLZPflO3LZbL31WV+zF+FtnV X-Google-Smtp-Source: ABdhPJxapFqKMFJHTP+sbSXlSYVN7BR7R9/ZuAtoCaYCn7f+axTEvYNWvZuM1pgSpkTizhUe0gVXhw== X-Received: by 2002:a1c:1d04:: with SMTP id d4mr5643988wmd.103.1638354346420; Wed, 01 Dec 2021 02:25:46 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id f7sm788282wmg.6.2021.12.01.02.25.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 02:25:45 -0800 (PST) Date: Wed, 1 Dec 2021 10:25:44 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Do not free task for _parent Message-ID: <20211201102544.GA1635366@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.3 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-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" When a task was stored in a record, GNAT would mistakenly generate a call to free_task twice, the first being correct and triggered by the freeing of the record, the second being incorrect and generated from recursing through the record's _parent. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * exp_ch7.adb (Cleanup_Record): Don't process parent. diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb --- a/gcc/ada/exp_ch7.adb +++ b/gcc/ada/exp_ch7.adb @@ -4629,8 +4629,9 @@ package body Exp_Ch7 is Comp := First_Component (U_Typ); while Present (Comp) loop - if Has_Task (Etype (Comp)) - or else Has_Simple_Protected_Object (Etype (Comp)) + if Chars (Comp) /= Name_uParent + and then (Has_Task (Etype (Comp)) + or else Has_Simple_Protected_Object (Etype (Comp))) then Tsk := Make_Selected_Component (Loc,