From patchwork Mon Oct 25 15:09:05 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: 46625 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 4A65F3858415 for ; Mon, 25 Oct 2021 15:15:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A65F3858415 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1635174914; bh=u0g2pDCMQo1uUvesOzK3hkC6L3gIv/ihfg79YGUngOE=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=d+MbZeHpb9BQ3nUwZwcXqhJwmKC006dlvz7xP+5dMjbZcq7VItdNVoEhHIsc3SLeX NPpHJiWZN4nFC0pfPUUWglR1ubV61UQ7x6JTydLh7T2bY8oQKNaODuhpA42lo/Cv6k rZXz+HBnORXhuYbMCE+78cCFzbyeyMiM2BQN/yzc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by sourceware.org (Postfix) with ESMTPS id 812ED385800A for ; Mon, 25 Oct 2021 15:09:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 812ED385800A Received: by mail-lj1-x236.google.com with SMTP id l5so14193919lja.13 for ; Mon, 25 Oct 2021 08:09:10 -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=u0g2pDCMQo1uUvesOzK3hkC6L3gIv/ihfg79YGUngOE=; b=se631gfDSUg8W0D5SB0gNdDfWbTt/MstPvQr3r4LOd3g/38i89DKgFIVmR0gqruYN2 oSPPYXDP2dBWkYGz33NCWP6VT9ifHqLNbcaMdEv282UVvwKUS0IJFw6yjhiQFKzf9fKy y3cgyobm8tbD1OCeOIQj5N2EK6Loq5u6a4UsyoIOTxyRRkcxPkDp+GZr7M/9PdgCTLSS SToXQ1mZTb+g/5pdseyO1ck9kiSPFNa0FrIb4i+0+xxpoDBTztDgcYKkcma+s17WKBEs 2KJ0xk490Sfp7K2fnKps1ziow0ocFQuhVs1e3kiZzqmk/9H60+PhD4oZCcGcM+UjhVLO ey8g== X-Gm-Message-State: AOAM531imlcK6fRarDjSJW9zwN61VVn3kWo2XbodICyn0xYra1NYU/M/ ziybGOQg2PY1XO2i6NGZWdYLh64RnCPzkw== X-Google-Smtp-Source: ABdhPJyb0bf/PkAy966ExC+wZ6QDVEUS6G2jA6AhliPQRyCCaWFQEU4CfXFyQ15C8qhVc0HU69xH0A== X-Received: by 2002:a2e:aaa8:: with SMTP id bj40mr19614793ljb.47.1635174547988; Mon, 25 Oct 2021 08:09:07 -0700 (PDT) Received: from adacore.com ([2a02:2ab8:224:2ce:72b5:e8ff:feef:ee60]) by smtp.gmail.com with ESMTPSA id p8sm130192lfg.203.2021.10.25.08.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Oct 2021 08:09:07 -0700 (PDT) Date: Mon, 25 Oct 2021 15:09:05 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Don't expect enumeration literals to be renamings Message-ID: <20211025150905.GA346487@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, 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: Piotr Trojanek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" When using cross-reference information to get subprogram effects in SPARK (i.e. its reads and writes), we were calling Renamed_Object on enumeration literals. This was pointless but harmless; now it rightly triggers an assertion failure in developer builds, so avoid that. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * lib-xref.adb (Get_Through_Renamings): Exit loop when an enumeration literal is found. diff --git a/gcc/ada/lib-xref.adb b/gcc/ada/lib-xref.adb --- a/gcc/ada/lib-xref.adb +++ b/gcc/ada/lib-xref.adb @@ -481,7 +481,9 @@ package body Lib.Xref is -- e.g. function call, slicing of a function call, -- pointer dereference, etc. - if No (Obj) then + if No (Obj) + or else Ekind (Obj) = E_Enumeration_Literal + then return Empty; end if; else