From 2fa15f237df903f4809733afee950f955559fbf7 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Mon, 10 Sep 2012 22:18:24 +0000 Subject: [PATCH] crash printing optimized out variant type Assuming the following declarations: type Discriminants_Record (A : Integer; B : Boolean) is record C : Float; end record; Z : Discriminants_Record := (A => 1, B => False, C => 2.0); If variable Z is not used, and the compiler optimizes it out, GDB would crash as follow: (gdb) print Z /[...]/gdb/valops.c:1121: internal-error: Unexpected lazy value type. This is because the ada-lang module forgot to set the optimized_out flag in the value returned by ada_evaluate_subexp during the value's "fixing" process. Later on, when trying to print the resulting value, GDB finds that the value is still lazily allocated, and thus tries to fetch it. But this is not allowed for not_lval values, hence the internal error. gdb/ChangeLog: * ada-lang.c (coerce_unspec_val_to_type): Make sure that the optimized_out flag is preserved. gdb/testsuite/ChangeLog: * gdb.ada/optim_drec: New testcase. --- gdb/ChangeLog | 5 ++++ gdb/ada-lang.c | 1 + gdb/testsuite/ChangeLog | 4 +++ gdb/testsuite/gdb.ada/optim_drec.exp | 34 ++++++++++++++++++++++++ gdb/testsuite/gdb.ada/optim_drec/foo.adb | 25 +++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/optim_drec.exp create mode 100644 gdb/testsuite/gdb.ada/optim_drec/foo.adb diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f70ee711e6b..01604a81c78 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-09-10 Joel Brobecker + + * ada-lang.c (coerce_unspec_val_to_type): Make sure that + the optimized_out flag is preserved. + 2012-09-10 Anthony Green * moxie-tdep.c (moxie_analyze_prologue): Update for function diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index bba045b4ba3..f45815f7686 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -581,6 +581,7 @@ coerce_unspec_val_to_type (struct value *val, struct type *type) set_value_bitsize (result, value_bitsize (val)); set_value_bitpos (result, value_bitpos (val)); set_value_address (result, value_address (val)); + set_value_optimized_out (result, value_optimized_out (val)); return result; } } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b33b6fabc26..e9db80fb750 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-09-10 Joel Brobecker + + * gdb.ada/optim_drec: New testcase. + 2012-09-10 Doug Evans * boards/fission.exp: Explicitly mark "board" as not remote. diff --git a/gdb/testsuite/gdb.ada/optim_drec.exp b/gdb/testsuite/gdb.ada/optim_drec.exp new file mode 100644 index 00000000000..6508e047d6c --- /dev/null +++ b/gdb/testsuite/gdb.ada/optim_drec.exp @@ -0,0 +1,34 @@ +# Copyright 2012 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 . + +load_lib "ada.exp" + +standard_ada_testfile foo + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { + return -1 +} + +clean_restart ${testfile} + +if ![runto "foo" ] then { + perror "Couldn't run ${testfile}" + return +} + +gdb_test "print z" \ + "= (\\(a => .*, b => .*, c => .*\\)|)" + + diff --git a/gdb/testsuite/gdb.ada/optim_drec/foo.adb b/gdb/testsuite/gdb.ada/optim_drec/foo.adb new file mode 100644 index 00000000000..88fd65262fa --- /dev/null +++ b/gdb/testsuite/gdb.ada/optim_drec/foo.adb @@ -0,0 +1,25 @@ +-- Copyright 2012 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 . + +procedure Foo is + type Discriminants_Record (A : Integer; B : Boolean) is record + C : Float; + end record; + -- The following variable is unused on purpose, and might be + -- optimized out by the compiler. + Z : Discriminants_Record := (A => 1, B => False, C => 2.0); +begin + null; +end Foo; -- 2.30.2