diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 095a6c2d635..c82d70fc8ce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-14  Tom Tromey  <tromey@adacore.com>
+
+	* ada-lang.c (coerce_unspec_val_to_type): Only set address when
+	value is not lval_memory.
+
 2019-05-14  Tom Tromey  <tromey@adacore.com>
 
 	* solib.c (info_sharedlibrary_command): Style the file name.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index dee3a83f98c..23197f60340 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -672,7 +672,8 @@ coerce_unspec_val_to_type (struct value *val, struct type *type)
       set_value_component_location (result, val);
       set_value_bitsize (result, value_bitsize (val));
       set_value_bitpos (result, value_bitpos (val));
-      set_value_address (result, value_address (val));
+      if (VALUE_LVAL (result) == lval_memory)
+	set_value_address (result, value_address (val));
       return result;
     }
 }