From patchwork Tue May 29 09:47:46 2018 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: 921910 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-478640-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="tgKiFPDU"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40w86b2Rx1z9s16 for ; Tue, 29 May 2018 19:48:07 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=S8Q4Wsd7/hk6pB58kECF+t24JtHR6AR17YHRruYdC0RBMe5eJf bQLFvWR7DyoDlBnWBv2tWS8Fun0VzdpQXpeNTVQDJ5KouYHPHKlhHgi1iX+zXFr3 B0AFKRFOQDaCyg5fdrZ39/M+godY7J6mmuGMbgYHVhUR3MMjWXmvrNveI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=ckEuf8ewnRIZq90+vBFt6bLkmHw=; b=tgKiFPDUm5GVTW2hxD/y UaTjtv85oREvI4wOD7goPuqitJllXxsD7S7RTFNhJh5RbuVMRa5O0ebZwf1dQ5/v VVsmHDDve3Vwb3rSnsDb3Ua9lUY4Q2RKnOa5QQo54yOXKXgAgBSvy2B5R669keS4 kmlF1aCZfKGb7qJAnRbm5D0= Received: (qmail 114716 invoked by alias); 29 May 2018 09:47:50 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 114641 invoked by uid 89); 29 May 2018 09:47:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:2544 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 May 2018 09:47:48 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 932835600C; Tue, 29 May 2018 05:47:46 -0400 (EDT) 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 Oc1t+OIoTDet; Tue, 29 May 2018 05:47:46 -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 82C2C56006; Tue, 29 May 2018 05:47:46 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 81CC178A; Tue, 29 May 2018 05:47:46 -0400 (EDT) Date: Tue, 29 May 2018 05:47:46 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [Ada] Minor cleanup in repinfo unit Message-ID: <20180529094746.GA105124@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This factors out the various cases where a marker for an unknown value is output by the -gnatR switches. No functional changes. Tested on x86_64-pc-linux-gnu, committed on trunk 2018-05-29 Eric Botcazou gcc/ada/ * repinfo.adb (Write_Unknown_Val): New procedure. (List_GCC_Expression): Call it. (List_Record_Layout): Likewise. (Write_Val): Likewise. --- gcc/ada/repinfo.adb +++ gcc/ada/repinfo.adb @@ -189,6 +189,9 @@ package body Repinfo is procedure Write_Mechanism (M : Mechanism_Type); -- Writes symbolic string for mechanism represented by M + procedure Write_Unknown_Val; + -- Writes symbolic string for an unknown or non-representable value + procedure Write_Val (Val : Node_Ref_Or_Val; Paren : Boolean := False); -- Given a representation value, write it out. No_Uint values or values -- dependent on discriminants are written as two question marks. If the @@ -653,7 +656,7 @@ package body Repinfo is begin if U = No_Uint then - Write_Str ("??"); + Write_Unknown_Val; else Print_Expr (U); end if; @@ -1111,7 +1114,7 @@ package body Repinfo is -- Otherwise we can continue else - Write_Str ("??"); + Write_Unknown_Val; end if; end if; @@ -1128,8 +1131,8 @@ package body Repinfo is -- Allowing Uint_0 here is an annoying special case. Really -- this should be a fine Esize value but currently it means -- unknown, except that we know after gigi has back annotated - -- that a size of zero is real, since otherwise gigi back - -- annotates using No_Uint as the value to indicate unknown). + -- that a size of zero is real, since otherwise gigi back + -- annotates using No_Uint as the value to indicate unknown. if (Esize (Comp) = Uint_0 or else Known_Static_Esize (Comp)) and then Known_Static_Normalized_First_Bit (Comp) @@ -1151,7 +1154,7 @@ package body Repinfo is elsif List_Representation_Info < 3 or else (Esize (Comp) /= Uint_0 and then Unknown_Esize (Comp)) then - Write_Str ("??"); + Write_Unknown_Val; -- List_Representation >= 3 and Known_Esize (Comp) @@ -1674,6 +1677,15 @@ package body Repinfo is end case; end Write_Mechanism; + ----------------------- + -- Write_Unknown_Val -- + ----------------------- + + procedure Write_Unknown_Val is + begin + Write_Str ("??"); + end Write_Unknown_Val; + --------------- -- Write_Val -- --------------- @@ -1682,7 +1694,7 @@ package body Repinfo is begin if Rep_Not_Constant (Val) then if List_Representation_Info < 3 or else Val = No_Uint then - Write_Str ("??"); + Write_Unknown_Val; else if Paren then