From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [205.232.38.15]) by sourceware.org (Postfix) with ESMTP id 87932395704C for ; Thu, 29 Apr 2021 08:03:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 87932395704C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=derodat@adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 60F5D561B3; Thu, 29 Apr 2021 04:03:47 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id oX6282giFTTb; Thu, 29 Apr 2021 04:03:47 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 481C1561AB; Thu, 29 Apr 2021 04:03:47 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 47060193; Thu, 29 Apr 2021 04:03:47 -0400 (EDT) Date: Thu, 29 Apr 2021 04:03:47 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Arnaud Charlet Subject: [Ada] Spurious error on 'Image Message-ID: <20210429080347.GA133830@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="BOKacYhQ+x31HxR3" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Thu, 29 Apr 2021 08:03:51 -0000 --BOKacYhQ+x31HxR3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline As part of recent improvements related to discriminant checks, a regression was introduced in complex cases of generics and use of 'Image on an expression partially rewritten as a [raise Constraint_Error] node. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * sem_attr.adb (Check_Image_Type): Protect against empty Image_Type. --BOKacYhQ+x31HxR3 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -1466,7 +1466,11 @@ package body Sem_Attr is procedure Check_Image_Type (Image_Type : Entity_Id) is begin + -- Image_Type may be empty in case of another error detected, + -- or if an N_Raise_xxx_Error node is a parent of N. + if Ada_Version < Ada_2020 + and then Present (Image_Type) and then not Is_Scalar_Type (Image_Type) then Error_Msg_Ada_2020_Feature ("nonscalar ''Image", Sloc (P)); --BOKacYhQ+x31HxR3--