From patchwork Fri Jan 27 09:09:27 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Eric Botcazou <ebotcazou@adacore.com>
X-Patchwork-Id: 138200
Return-Path: 
 <gcc-patches-return-312130-incoming=patchwork.ozlabs.org@gcc.gnu.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from sourceware.org (server1.sourceware.org [209.132.180.131])
	by ozlabs.org (Postfix) with SMTP id 41836B6EF7
	for <incoming@patchwork.ozlabs.org>;
	Fri, 27 Jan 2012 20:12:46 +1100 (EST)
Comment: DKIM? See http://www.dkim.org
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed;
	d=gcc.gnu.org; s=default; x=1328260366; h=Comment:
	DomainKey-Signature:Received:Received:Received:Received:Received:
	Received:From:To:Subject:Date:User-Agent:MIME-Version:
	Content-Type:Message-Id:Mailing-List:Precedence:List-Id:
	List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:
	Delivered-To; bh=Dqdc3jLxeuRD8dAvxnPARZGFyug=; b=M1qpKk73c5f0PDZ
	Wa0XO2NzD7KYSM75y/kh+XqbzJspu6bnBh2PrjxLyLNrUnAEwF30R6h8uiPbHgq/
	bgt00QCDxgSlu9ytjhUUsvThz0tDoBghx5GgG3bdYxsYMTR4PQTJUGlZSkDc+uGS
	NiZF9ddW/lcYDqELpHTvv4CqmOck=
Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org;
	h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:From:To:Subject:Date:User-Agent:MIME-Version:Content-Type:Message-Id:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To;
	b=k0isXCfCDzBERRht+Ydb5p8KAiYbnG9hFlfhcTYrrFEWxkbPB3vK6aeOmfXVlJ
	RBn2UhoPfTCHC9zja6bCO7VsAmRueZfWfm0UDnevu8cgeZwnD5w1BLRilYrLNEER
	5+iAQtTwu9uS5eeafl2uTupAQZm+4pEbYIdndp0edx+JA=;
Received: (qmail 29332 invoked by alias); 27 Jan 2012 09:12:42 -0000
Received: (qmail 29322 invoked by uid 22791); 27 Jan 2012 09:12:41 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0	tests=AWL,BAYES_00,TW_TM
X-Spam-Check-By: sourceware.org
Received: from mel.act-europe.fr (HELO mel.act-europe.fr) (194.98.77.210) by
	sourceware.org (qpsmtpd/0.43rc1) with ESMTP;
	Fri, 27 Jan 2012 09:12:28 +0000
Received: from localhost (localhost [127.0.0.1])	by
	filtered-smtp.eu.adacore.com (Postfix) with ESMTP id
	72385290065	for <gcc-patches@gcc.gnu.org>;
	Fri, 27 Jan 2012 10:12:28 +0100 (CET)
Received: from mel.act-europe.fr ([127.0.0.1])	by localhost
	(smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port
	10024)	with ESMTP id 4POmcQwQPtlS for <gcc-patches@gcc.gnu.org>;
	Fri, 27 Jan 2012 10:12:28 +0100 (CET)
Received: from [192.168.1.2] (bon31-6-88-161-99-133.fbx.proxad.net
	[88.161.99.133])	(using TLSv1 with cipher DHE-RSA-AES256-SHA
	(256/256 bits))	(No client certificate requested)	by
	mel.act-europe.fr (Postfix) with ESMTP id 10DDB29005E	for
	<gcc-patches@gcc.gnu.org>; Fri, 27 Jan 2012 10:12:28 +0100 (CET)
From: Eric Botcazou <ebotcazou@adacore.com>
To: gcc-patches@gcc.gnu.org
Subject: [Ada] Small tweak to help GDB to display labels
Date: Fri, 27 Jan 2012 10:09:27 +0100
User-Agent: KMail/1.9.9
MIME-Version: 1.0
Message-Id: <201201271009.27314.ebotcazou@adacore.com>
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

In the same basket as the previous one.

Tested on i586-suse-linux, applied on the mainline.


2012-01-27  Eric Botcazou  <ebotcazou@adacore.com>

	* gcc-interface/gigi.h (create_label_decl): Adjust.
	* gcc-interface/utils.c (create_label_decl): Add GNAT_NODE parameter
	and invoke gnat_pushdecl on it.  Remove obsolete settings.
	* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Label>: Adjust call to
	create_label_decl.
	* gcc-interface/trans.c (gnat_to_gnu) <N_Null): Likewise.  Ignore the
	label for debugging purposes.

Index: gcc-interface/utils.c
===================================================================
--- gcc-interface/utils.c	(revision 183604)
+++ gcc-interface/utils.c	(working copy)
@@ -6,7 +6,7 @@
  *                                                                          *
  *                          C Implementation File                           *
  *                                                                          *
- *          Copyright (C) 1992-2011, Free Software Foundation, Inc.         *
+ *          Copyright (C) 1992-2012, Free Software Foundation, Inc.         *
  *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
@@ -1849,17 +1849,19 @@ potential_alignment_gap (tree prev_field
   return true;
 }
 
-/* Return a LABEL_DECL node for LABEL_NAME.  */
+/* Return a LABEL_DECL with LABEL_NAME.  GNAT_NODE is used for the position
+   of the decl.  */
 
 tree
-create_label_decl (tree label_name)
+create_label_decl (tree label_name, Node_Id gnat_node)
 {
-  tree label_decl = build_decl (input_location,
-				LABEL_DECL, label_name, void_type_node);
+  tree label_decl
+    = build_decl (input_location, LABEL_DECL, label_name, void_type_node);
 
-  DECL_CONTEXT (label_decl)     = current_function_decl;
-  DECL_MODE (label_decl)        = VOIDmode;
-  DECL_SOURCE_LOCATION (label_decl) = input_location;
+  DECL_MODE (label_decl) = VOIDmode;
+
+  /* Add this decl to the current binding level.  */
+  gnat_pushdecl (label_decl, gnat_node);
 
   return label_decl;
 }
Index: gcc-interface/decl.c
===================================================================
--- gcc-interface/decl.c	(revision 183605)
+++ gcc-interface/decl.c	(working copy)
@@ -4619,7 +4619,7 @@ gnat_to_gnu_entity (Entity_Id gnat_entit
       break;
 
     case E_Label:
-      gnu_decl = create_label_decl (gnu_entity_name);
+      gnu_decl = create_label_decl (gnu_entity_name, gnat_entity);
       break;
 
     case E_Block:
Index: gcc-interface/gigi.h
===================================================================
--- gcc-interface/gigi.h	(revision 183604)
+++ gcc-interface/gigi.h	(working copy)
@@ -672,8 +672,9 @@ extern tree create_field_decl (tree fiel
 extern tree create_param_decl (tree param_name, tree param_type,
                                bool readonly);
 
-/* Return a LABEL_DECL node for LABEL_NAME.  */
-extern tree create_label_decl (tree label_name);
+/* Return a LABEL_DECL with LABEL_NAME.  GNAT_NODE is used for the position
+   of the decl.  */
+extern tree create_label_decl (tree, Node_Id);
 
 /* Return a FUNCTION_DECL node.  SUBPROG_NAME is the name of the subprogram,
    ASM_NAME is its assembler name, SUBPROG_TYPE is its type (a FUNCTION_TYPE
Index: gcc-interface/trans.c
===================================================================
--- gcc-interface/trans.c	(revision 183604)
+++ gcc-interface/trans.c	(working copy)
@@ -5881,7 +5881,8 @@ gnat_to_gnu (Node_Id gnat_node)
 	 the next statement that the middle-end knows how to preserve.  */
       if (!optimize && Comes_From_Source (gnat_node))
 	{
-	  tree stmt, label = create_label_decl (NULL_TREE);
+	  tree stmt, label = create_label_decl (NULL_TREE, gnat_node);
+	  DECL_IGNORED_P (label) = 1;
 	  start_stmt_group ();
 	  stmt = build1 (GOTO_EXPR, void_type_node, label);
 	  set_expr_location_from_node (stmt, gnat_node);