7 files changed, 126 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e7c34a5..3efb697 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-05  Joel Brobecker  <brobecker@adacore.com>
+
+	* ada-lang.c (ada_to_fixed_value_create): Add handling of
+	the case where VALUE_LVAL (val0) is not lval_memory.
+
 2018-01-05  Xavier Roirand  <roirand@adacore.com>
 
 	* ada-valprint.c (print_optional_low_bound): Handle
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 4ecf7b0..85e50cc 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -9344,8 +9344,16 @@ ada_to_fixed_value_create (struct type *type0, CORE_ADDR address,
 
   if (type == type0 && val0 != NULL)
     return val0;
-  else
-    return value_from_contents_and_address (type, 0, address);
+
+  if (VALUE_LVAL (val0) != lval_memory)
+    {
+      /* Our value does not live in memory; it could be a convenience
+	 variable, for instance.  Create a not_lval value using val0's
+	 contents.  */
+      return value_from_contents (type, value_contents (val0));
+    }
+
+  return value_from_contents_and_address (type, 0, address);
 }
 
 /* A value representing VAL, but with a standard (static-sized) type
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a2b8abf..ecc7110 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-05  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.ada/convvar_comp: New testcase.
+
 2018-01-05  Xavier Roirand  <roirand@adacore.com>
 
 	* testsuite/gdb.ada/array_char_idx/pck.ads (Table): New type.
diff --git a/gdb/testsuite/gdb.ada/convvar_comp.exp b/gdb/testsuite/gdb.ada/convvar_comp.exp
new file mode 100644
index 0000000..d82ec5f
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/convvar_comp.exp
@@ -0,0 +1,34 @@
+# Copyright 2018 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+load_lib "ada.exp"
+
+standard_ada_testfile pb16_063
+
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+  return -1
+}
+
+clean_restart ${testfile}
+
+if ![runto "break_me" ] then {
+  perror "Couldn't run ${testfile}"
+  return
+}
+
+gdb_test_no_output "set variable \$item := item"
+
+gdb_test "print \$item.started" \
+         " = \\(0, 0, 0\\)"
diff --git a/gdb/testsuite/gdb.ada/convvar_comp/pb16_063.adb b/gdb/testsuite/gdb.ada/convvar_comp/pb16_063.adb
new file mode 100644
index 0000000..6d808f4
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/convvar_comp/pb16_063.adb
@@ -0,0 +1,23 @@
+--  Copyright 2018 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+with Pck;
+
+procedure PB16_063 is
+   My_Item : Pck.T;
+   Ignored : Boolean;
+begin
+   My_Item := Pck.Null_T;
+   Ignored := Pck.Break_Me (My_Item);
+end PB16_063;
diff --git a/gdb/testsuite/gdb.ada/convvar_comp/pck.adb b/gdb/testsuite/gdb.ada/convvar_comp/pck.adb
new file mode 100644
index 0000000..09f13d1
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/convvar_comp/pck.adb
@@ -0,0 +1,21 @@
+--  Copyright 2018 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package body Pck is
+  function Break_Me (Item : T) return Boolean is
+  begin
+     return False;
+   end Break_Me;
+end Pck;
diff --git a/gdb/testsuite/gdb.ada/convvar_comp/pck.ads b/gdb/testsuite/gdb.ada/convvar_comp/pck.ads
new file mode 100644
index 0000000..0f46132
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/convvar_comp/pck.ads
@@ -0,0 +1,29 @@
+--  Copyright 2018 Free Software Foundation, Inc.
+--
+--  This program is free software; you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation; either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package Pck is
+
+   type Kind_T is (One, Two, Three);
+   --  type Kind_T is new Integer range 1 .. 3;
+   type Time_Set_T is array (Kind_T) of Integer;
+
+   type T  is record
+      Started    : Time_Set_T;
+   end record;
+
+   Null_T : constant T := (Started => (others => 0));
+
+   function Break_Me (Item : T) return Boolean;
+end Pck;