diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 81d8337e0504..587d61c6a6b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-01  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	* dwarf2out.c (dwarf2out_late_global_decl): Add locations for
+	symbols that hold a DECL_VALUE_EXPR.
+
 2017-06-01  Martin Jambor  <mjambor@suse.cz>
 
 	PR tree-optimization/80898
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 7983f52c5eff..036d0a8f8468 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -25545,9 +25545,10 @@ dwarf2out_late_global_decl (tree decl)
 	{
 	  /* We get called via the symtab code invoking late_global_decl
 	     for symbols that are optimized out.  Do not add locations
-	     for those.  */
+	     for those, except if they have a DECL_VALUE_EXPR, in which case
+	     they are relevant for debuggers.  */
 	  varpool_node *node = varpool_node::get (decl);
-	  if (! node || ! node->definition)
+	  if ((! node || ! node->definition) && ! DECL_HAS_VALUE_EXPR_P (decl))
 	    tree_add_const_value_attribute_for_decl (die, decl);
 	  else
 	    add_location_or_const_value_attribute (die, decl, false);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e398b31644a1..ff1b0703d51c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-01  Pierre-Marie de Rodat  <derodat@adacore.com>
+
+	* debug12.adb, debug12.ads: New testcase.
+
 2017-06-01  Martin Jambor  <mjambor@suse.cz>
 
 	PR tree-optimization/80898
diff --git a/gcc/testsuite/gnat.dg/debug12.adb b/gcc/testsuite/gnat.dg/debug12.adb
new file mode 100644
index 000000000000..07175968703a
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/debug12.adb
@@ -0,0 +1,9 @@
+--  { dg-options "-cargs -gdwarf-4 -fdebug-types-section -dA -margs" }
+--  { dg-final { scan-assembler-times "DW_AT_location" 4 } }
+
+package body Debug12 is
+   function Get_A2 return Boolean is
+   begin
+      return A2;
+   end Get_A2;
+end Debug12;
diff --git a/gcc/testsuite/gnat.dg/debug12.ads b/gcc/testsuite/gnat.dg/debug12.ads
new file mode 100644
index 000000000000..dbc5896cc732
--- /dev/null
+++ b/gcc/testsuite/gnat.dg/debug12.ads
@@ -0,0 +1,8 @@
+package Debug12 is
+   type Bit_Array is array (Positive range <>) of Boolean
+      with Pack;
+   A  : Bit_Array := (1 .. 10 => False);
+   A2 : Boolean renames A (2);
+
+   function Get_A2 return Boolean;
+end Debug12;