From patchwork Mon Oct 9 20:37:52 2017 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: 823499 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-463821-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="ZWnCL+Yj"; 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 3y9sWZ3WRjz9t5Q for ; Tue, 10 Oct 2017 07:38:02 +1100 (AEDT) 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=waRu5Teph5lVg5jJQu4O8ef70kmF2NEhdnhggj1gIhwzoZkfFo mq5xUaVCL7s8+vlopCyLg53zp8ADBK6SxmnpTHbhlvo7HX1BDL01jKHq9iR2tsvr 1viqdKAkJnjy+GAFk919kgssI4n5oSPZzBGWKZuRMKvp6LR2g1aF+DJU4= 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=Nm7Xqxm0DM3FgwFxJtAAiKBkU4c=; b=ZWnCL+Yj5J0gCK32guJv nVU0/y5ucDD/9udUtI5AlHEaPaCHX5v6dSYdCoGhq5jaF9M7mxMSX/trN7imhmvJ CTfuOHGPGgPENYgvg3xIGs3sUtcb/JRG2Hu+YwTZ0wX97lV6A2WT/qMbTCCKMra5 lcXudsgzRXUFDHstgq6zW7U= Received: (qmail 49430 invoked by alias); 9 Oct 2017 20:37:55 -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 49421 invoked by uid 89); 9 Oct 2017 20:37:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=testa, UD:A 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; Mon, 09 Oct 2017 20:37:54 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id E7EB056326; Mon, 9 Oct 2017 16:37:52 -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 ezeXz+J-QFkJ; Mon, 9 Oct 2017 16:37:52 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id D7F275631C; Mon, 9 Oct 2017 16:37:52 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id D562343A; Mon, 9 Oct 2017 16:37:52 -0400 (EDT) Date: Mon, 9 Oct 2017 16:37:52 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Ed Schonberg Subject: [Ada] Crash on child unit name with -gnatdJ Message-ID: <20171009203752.GA1301@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes When the debugging switch -gnatdJ is present, warning messages include the name of the unit within which the warning is generated. This patch fixes a crash in the compiler when a warning appears within a child unit. The command gcc -c -gnatdJ test-a.ads must yield; test-a.ads:6:17: warning: Test.A: unused variable "X" --- package Test is end Test; --- with Test; package Test.A is function P return Natural is (3) with Pre => (for all X in Natural => True); end Test.A; Tested on x86_64-pc-linux-gnu, committed on trunk 2017-10-09 Ed Schonberg * sem_util.adb (Subprogram_Name): If this is a child unit, use the name of the Defining_Program_Unit_Name, which is an identifier, in order to construct the string for the fully qualified name. Index: sem_util.adb =================================================================== --- sem_util.adb (revision 253559) +++ sem_util.adb (working copy) @@ -23257,7 +23257,16 @@ return "unknown subprogram"; end if; - Append_Entity_Name (Buf, Ent); + if Nkind (Ent) = N_Defining_Program_Unit_Name then + + -- If the subprogram is a child unit, use its simple name to + -- start the construction of the fully qualified name. + + Append_Entity_Name (Buf, Defining_Identifier (Ent)); + + else + Append_Entity_Name (Buf, Ent); + end if; return +Buf; end Subprogram_Name;