exp_dbug.adb (Debug_Renaming_Declaration): Do not output any debug declaration for...

2010-06-14  Jerome Lambourg  <lambourg@adacore.com>

	* exp_dbug.adb (Debug_Renaming_Declaration): Do not output any debug
	declaration for VMs, as those are useless and might lead to duplicated
	local variable names in the generated code.
	* gcc-interface/Make-lang.in: Update dependdencies.

From-SVN: r160721

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3b5d5f6..dc7b429 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-14  Jerome Lambourg  <lambourg@adacore.com>
+
+       * exp_dbug.adb (Debug_Renaming_Declaration): Do not output any debug
+       declaration for VMs, as those are useless and might lead to duplicated
+       local variable names in the generated code.
+       * gcc-interface/Make-lang.in: Update dependencies.
+
 2010-06-14  Robert Dewar  <dewar@adacore.com>
 
        * opt.ads, sem.adb, sem_elab.adb: Minor reformatting

diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb
index 34ae7e2..610ac0e 100644 (file)
--- a/gcc/ada/exp_dbug.adb
+++ b/gcc/ada/exp_dbug.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1996-2008, Free Software Foundation, Inc.         --
+--          Copyright (C) 1996-2009, 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- --
@@ -38,6 +38,7 @@ with Sinfo;    use Sinfo;
 with Stand;    use Stand;
 with Stringt;  use Stringt;
 with Table;
+with Targparm; use Targparm;
 with Tbuild;   use Tbuild;
 with Urealp;   use Urealp;
 
@@ -341,6 +342,14 @@ package body Exp_Dbug is
          return Empty;
       end if;
 
+      --  Do not output those local variables in VM case, as this does not
+      --  help debugging (they are just unused), and might lead to duplicated
+      --  local variable names.
+
+      if VM_Target /= No_VM then
+         return Empty;
+      end if;
+
       --  Get renamed entity and compute suffix
 
       Name_Len := 0;

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index b819523..6f42a0e 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -2033,13 +2033,14 @@ ada/exp_dbug.o : ada/ada.ads ada/a-except.ads ada/a-unccon.ads \
    ada/exp_dbug.ads ada/exp_dbug.adb ada/gnat.ads ada/g-htable.ads \
    ada/hostparm.ads ada/interfac.ads ada/namet.ads ada/namet.adb \
    ada/nlists.ads ada/nlists.adb ada/nmake.ads ada/nmake.adb ada/opt.ads \
-   ada/output.ads ada/sem_aux.ads ada/sem_eval.ads ada/sem_util.ads \
-   ada/sinfo.ads ada/sinfo.adb ada/sinput.ads ada/snames.ads ada/stand.ads \
-   ada/stringt.ads ada/system.ads ada/s-exctab.ads ada/s-htable.ads \
-   ada/s-imenne.ads ada/s-memory.ads ada/s-os_lib.ads ada/s-parame.ads \
-   ada/s-secsta.ads ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads \
-   ada/s-stoele.ads ada/s-stoele.adb ada/s-string.ads ada/s-traent.ads \
-   ada/s-unstyp.ads ada/s-wchcon.ads ada/table.ads ada/table.adb \
+   ada/output.ads ada/rident.ads ada/sem_aux.ads ada/sem_eval.ads \
+   ada/sem_util.ads ada/sinfo.ads ada/sinfo.adb ada/sinput.ads \
+   ada/snames.ads ada/stand.ads ada/stringt.ads ada/system.ads \
+   ada/s-exctab.ads ada/s-htable.ads ada/s-imenne.ads ada/s-memory.ads \
+   ada/s-os_lib.ads ada/s-parame.ads ada/s-rident.ads ada/s-secsta.ads \
+   ada/s-soflin.ads ada/s-stache.ads ada/s-stalib.ads ada/s-stoele.ads \
+   ada/s-stoele.adb ada/s-string.ads ada/s-traent.ads ada/s-unstyp.ads \
+   ada/s-wchcon.ads ada/table.ads ada/table.adb ada/targparm.ads \
    ada/tbuild.ads ada/tree_io.ads ada/types.ads ada/uintp.ads \
    ada/uintp.adb ada/unchconv.ads ada/unchdeal.ads ada/urealp.ads \
    ada/urealp.adb ada/widechar.ads