From 1ac7452264fee536b0f62610e8dbe9f9e253a6f8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 15 Mar 2021 06:23:12 -0600 Subject: [PATCH] Fix Ada assignment resolution The expression rewrite missed an Ada resolution case. GDB previously knew how to disambiguate the right hand side of an assignment, but now it does not. This patch fixes the problem and adds the missing test case. gdb/ChangeLog 2021-03-15 Tom Tromey * ada-exp.y (exp1): Handle resolution of the right hand side of an assignment. gdb/testsuite/ChangeLog 2021-03-15 Tom Tromey * gdb.ada/enums_overload/enums_overload_main.adb: New file. * gdb.ada/enums_overload/enums_overload.ads: New file. * gdb.ada/enums_overload/enums_overload.adb: New file. * gdb.ada/enums_overload.exp: New file. --- gdb/ChangeLog | 5 +++ gdb/ada-exp.y | 12 +++++- gdb/testsuite/ChangeLog | 7 ++++ gdb/testsuite/gdb.ada/enums_overload.exp | 37 ++++++++++++++++++ .../gdb.ada/enums_overload/enums_overload.adb | 38 +++++++++++++++++++ .../gdb.ada/enums_overload/enums_overload.ads | 24 ++++++++++++ .../enums_overload/enums_overload_main.adb | 20 ++++++++++ 7 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.ada/enums_overload.exp create mode 100644 gdb/testsuite/gdb.ada/enums_overload/enums_overload.adb create mode 100644 gdb/testsuite/gdb.ada/enums_overload/enums_overload.ads create mode 100644 gdb/testsuite/gdb.ada/enums_overload/enums_overload_main.adb diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da5c36b6813..ed4da7aae93 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-03-15 Tom Tromey + + * ada-exp.y (exp1): Handle resolution of the right hand side of an + assignment. + 2021-03-15 Tom Tromey * ada-lang.c (ada_aggregate_operation::assign_aggregate): Return diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 222fec536f3..4300907685c 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -413,7 +413,17 @@ exp1 : exp | exp1 ';' exp { ada_wrap2 (); } | primary ASSIGN exp /* Extension for convenience */ - { ada_wrap2 (); } + { + operation_up rhs = pstate->pop (); + operation_up lhs = ada_pop (); + value *lhs_val + = lhs->evaluate (nullptr, pstate->expout.get (), + EVAL_AVOID_SIDE_EFFECTS); + rhs = resolve (std::move (rhs), true, + value_type (lhs_val)); + pstate->push_new + (std::move (lhs), std::move (rhs)); + } ; /* Expressions, not including the sequencing operator. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 25f072d6105..7df84af72fc 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2021-03-15 Tom Tromey + + * gdb.ada/enums_overload/enums_overload_main.adb: New file. + * gdb.ada/enums_overload/enums_overload.ads: New file. + * gdb.ada/enums_overload/enums_overload.adb: New file. + * gdb.ada/enums_overload.exp: New file. + 2021-03-15 Tom Tromey * gdb.ada/assign_arr/target_wrapper.ads (IArray, Put, Do_Nothing): diff --git a/gdb/testsuite/gdb.ada/enums_overload.exp b/gdb/testsuite/gdb.ada/enums_overload.exp new file mode 100644 index 00000000000..165ee1e1147 --- /dev/null +++ b/gdb/testsuite/gdb.ada/enums_overload.exp @@ -0,0 +1,37 @@ +# Copyright 2021 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" + +if { [skip_ada_tests] } { return -1 } + +standard_ada_testfile enums_overload_main + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "STOP" ${testdir}/enums_overload.adb] +runto "enums_overload.adb:$bp_location" + +gdb_test "ptype x" "type = range red \\.\\. yellow" +gdb_test "print x := red" " = red" +gdb_test "print x" " = red" +gdb_test "print enums_overload.reddish'(red)" " = red" \ + "function call disambiguates enum" +gdb_test "print y := red" " = red" +gdb_test "print y" " = red" diff --git a/gdb/testsuite/gdb.ada/enums_overload/enums_overload.adb b/gdb/testsuite/gdb.ada/enums_overload/enums_overload.adb new file mode 100644 index 00000000000..a245d58b24d --- /dev/null +++ b/gdb/testsuite/gdb.ada/enums_overload/enums_overload.adb @@ -0,0 +1,38 @@ +-- Copyright 2021 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 . + +package body Enums_Overload is + + subtype Reddish is Color range Red .. Yellow; + + procedure Test_Enums_Overload is + X: Reddish := Orange; + Y: Traffic_Signal := Yellow; + begin + --gdb: next + X := Orange; + --gdb: next + Y := Yellow; + --gdb: ptype x range red .. yellow + --gdb: set x := red + --gdb: print x red + --gdb: print enums_overload.reddish'(red) red + --gdb: set y := red + --gdb: print y red + --gdb: cont + null; -- STOP + end Test_Enums_Overload; + +end Enums_Overload; diff --git a/gdb/testsuite/gdb.ada/enums_overload/enums_overload.ads b/gdb/testsuite/gdb.ada/enums_overload/enums_overload.ads new file mode 100644 index 00000000000..f3158fa1509 --- /dev/null +++ b/gdb/testsuite/gdb.ada/enums_overload/enums_overload.ads @@ -0,0 +1,24 @@ +-- Copyright 2021 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 . + +package Enums_Overload is + + type Color is (Red, Orange, Yellow, Green, Blue, Violet, Indigo); + + type Traffic_Signal is (Green, Yellow, Red); + + procedure Test_Enums_Overload; + +end Enums_Overload; diff --git a/gdb/testsuite/gdb.ada/enums_overload/enums_overload_main.adb b/gdb/testsuite/gdb.ada/enums_overload/enums_overload_main.adb new file mode 100644 index 00000000000..954243337ec --- /dev/null +++ b/gdb/testsuite/gdb.ada/enums_overload/enums_overload_main.adb @@ -0,0 +1,20 @@ +-- Copyright 2021 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 . + +with Enums_Overload; +procedure Enums_Overload_Main is +begin + Enums_Overload.Test_Enums_Overload; +end Enums_Overload_Main; -- 2.30.2