From patchwork Fri Nov 4 15:47:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinevere Larsen X-Patchwork-Id: 59947 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D90223858431 for ; Fri, 4 Nov 2022 15:53:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D90223858431 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667577190; bh=ocqX9Arn32bY4FGRHRngGnIXCxR3Eb2vWXYwoPRass4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Jb4LNDmUFVwi/vAV9SATi8OhaZSjHUq9yQXvmJ+fHQatsgb0Kfp6KlJz1AVZGzZ4e 2ZWnAewmL9W6BP6L6jSTpYwgSOCBJaWqvRJat0F/sjEDFIcZZ59xkgO3IYaDGqQboV olqW8gaktnEru4bp49rsTEg21qaAWcwDkN2tTzxk= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 498BF3858429 for ; Fri, 4 Nov 2022 15:52:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 498BF3858429 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-252-28h0LFvzMNGCWHh4wi048g-1; Fri, 04 Nov 2022 11:52:11 -0400 X-MC-Unique: 28h0LFvzMNGCWHh4wi048g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8034382F647 for ; Fri, 4 Nov 2022 15:52:11 +0000 (UTC) Received: from fedora.redhat.com (ovpn-193-145.brq.redhat.com [10.40.193.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBC94140EBF5; Fri, 4 Nov 2022 15:52:10 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH v2 1/2] gdb/testsuite: allowed for function_range to deal with mangled functions Date: Fri, 4 Nov 2022 16:47:44 +0100 Message-Id: <20221104154744.418906-2-blarsen@redhat.com> In-Reply-To: <20221104154744.418906-1-blarsen@redhat.com> References: <20221104154744.418906-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Bruno Larsen via Gdb-patches From: Guinevere Larsen Reply-To: Bruno Larsen Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" When calling get_func_info inside a test case, it would cause failures if the function was printed using a C++ style mangled name. The current patch fixes this by allowing for mangled names along with the current rules. --- gdb/testsuite/lib/dwarf.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index b843b1acf75..9df8e7f9bdc 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -400,7 +400,7 @@ proc function_range { func src {options {debug}} } { if { $func_length != 0 } { set func_pattern "$func_pattern\\+$func_length" } - set test "x/2i $func+$func_length" + set test "with print asm-demangle on -- x/2i $func+$func_length" gdb_test_multiple $test $test { -re ".*($hex) <$func_pattern>:\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" { set start $expect_out(1,string) From patchwork Fri Nov 4 15:47:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinevere Larsen X-Patchwork-Id: 59945 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 80ED63858013 for ; Fri, 4 Nov 2022 15:52:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80ED63858013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667577164; bh=QG3UeGXEgh2FqsjwPNZdyS6F/TN7TX/zw8M2ql+PnRM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=VwwyrHlKf0UBbDhe2yFYHSGQKOWj/FbchyPvRGbcp2mUZ2MmlXyZBMePZNocRgSIh SaLtMrEWnavCuLD15st5EdAqnhnF5RyhlXevArv/upg9v+hJdc/l8DmK+0elVKanzB 3AvqiVv5YlROt/cCNfsA8yla+EJTj5vBC0XCxFHI= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 059753858420 for ; Fri, 4 Nov 2022 15:52:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 059753858420 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-471-zY-34G6FPaqNSxVZMIcNng-1; Fri, 04 Nov 2022 11:52:14 -0400 X-MC-Unique: zY-34G6FPaqNSxVZMIcNng-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 47E7F887400 for ; Fri, 4 Nov 2022 15:52:14 +0000 (UTC) Received: from fedora.redhat.com (ovpn-193-145.brq.redhat.com [10.40.193.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B9EA140EBF5; Fri, 4 Nov 2022 15:52:12 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH v2 2/2] gdb/c++: Improve error messages in overload resolution Date: Fri, 4 Nov 2022 16:47:45 +0100 Message-Id: <20221104154744.418906-3-blarsen@redhat.com> In-Reply-To: <20221104154744.418906-1-blarsen@redhat.com> References: <20221104154744.418906-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Bruno Larsen via Gdb-patches From: Guinevere Larsen Reply-To: Bruno Larsen Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" When resolving overloaded functions, GDB relies on knowing relationships between types, i.e. if a type inherits from another. However, some compilers may not add complete information for given types as a way to reduce unnecessary debug information. In these cases, GDB would just say that it couldn't resolve the method or function, with no extra information. The problem is that sometimes the user may not know that the type information is incomplete, and may just assume that there is a bug in GDB. To improve the user experience, we attempt to detect if the overload match failed because of an incomplete type, and warn the user of this. This commit also adds a testcase confirming that the message is only triggered in the correct scenario. This test was not developed as an expansion of gdb.cp/overload.cc because it needed the dwarf assembler, and porting all of overload.cc seemed unnecessary. --- .../gdb.cp/incomplete-type-overload.cc | 45 +++++ .../gdb.cp/incomplete-type-overload.exp | 183 ++++++++++++++++++ gdb/valops.c | 53 ++++- 3 files changed, 277 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.cp/incomplete-type-overload.cc create mode 100644 gdb/testsuite/gdb.cp/incomplete-type-overload.exp diff --git a/gdb/testsuite/gdb.cp/incomplete-type-overload.cc b/gdb/testsuite/gdb.cp/incomplete-type-overload.cc new file mode 100644 index 00000000000..a7b85c92bbe --- /dev/null +++ b/gdb/testsuite/gdb.cp/incomplete-type-overload.cc @@ -0,0 +1,45 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2022 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 . */ +class +base { +public: + int member; +}; + +class complete: public base { }; + +class incomplete: public base { }; + +complete comp; +complete *cp = ∁ +incomplete *inc; +int *ip; + +int +foo (base* b) +{ + asm ("foo_label: .globl foo_label"); + return 1; +} + +int +main (void) +{ + asm("main_label: .globl main_label"); + comp.member = 0; + return 0; +} diff --git a/gdb/testsuite/gdb.cp/incomplete-type-overload.exp b/gdb/testsuite/gdb.cp/incomplete-type-overload.exp new file mode 100644 index 00000000000..96ed25dd5d1 --- /dev/null +++ b/gdb/testsuite/gdb.cp/incomplete-type-overload.exp @@ -0,0 +1,183 @@ +# Copyright 2022 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 . + +# This file is part of GDB's testsuite. + +# This test intends to check the error message that GDB emits when unable +# to determine the correct overloaded function due to incomplete types. + +load_lib dwarf.exp + +if { [skip_cplus_tests] } { return } + +if { ![dwarf2_support] } { return } + +standard_testfile .cc .S +set asm_file [standard_output_file ${srcfile2}] + +if [prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}] { + return +} + +if {[test_compiler_info clang-*-*]} { + untested "gcc is required for dwarf assembler tests" + return +} + +if ![runto_main] { + return +} + +# Get important sizes to create fake dwarf for the test +set int_size [get_sizeof "int" -1] +set addr_size [get_sizeof "void *" -1] +set struct_base_size [get_sizeof "base" 4] +set struct_complete_size [get_sizeof "complete" 4] +get_func_info foo + +# Create fake DWARF for the .cc file. +# This is the best way to ensure we have an incomplete type. +Dwarf::assemble ${asm_file} { + global srcdir subdir srcfile srcfile2 foo_start foo_end + global int_size addr_size struct_base_size struct_complete_size + declare_labels L + + cu {} { + DW_TAG_compile_unit { + {DW_AT_language @DW_LANG_C_plus_plus} + {name $srcfile} + {stmt_list $L DW_FORM_sec_offset} + } { + declare_labels int_label base_label complete_label incomplete_label + declare_labels ptr_base_label ptr_inc_label ptr_comp_label ptr_int_label + + int_label: DW_TAG_base_type { + {DW_AT_byte_size $int_size DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_signed} + {DW_AT_name "int"} + } + + base_label: DW_TAG_class_type { + {DW_AT_byte_size $struct_base_size DW_FORM_sdata} + {DW_AT_name "base"} + } { + DW_TAG_member { + {DW_AT_name "member"} + {DW_AT_type :$int_label} + {DW_AT_data_member_location 0 DW_FORM_sdata} + } + } + + complete_label: DW_TAG_class_type { + {DW_AT_byte_size $struct_complete_size DW_FORM_sdata} + {DW_AT_name "complete"} + } { + DW_TAG_inheritance { + {DW_AT_type :$base_label} + {DW_AT_data_member_location 0 DW_FORM_sdata} + {DW_AT_accessibility 1 DW_FORM_data1} + } + } + + incomplete_label: DW_TAG_class_type { + {DW_AT_name "incomplete"} + {DW_AT_declaration 1 DW_FORM_flag_present} + } + + ptr_base_label: DW_TAG_pointer_type { + {DW_AT_byte_size $addr_size DW_FORM_udata} + {DW_AT_type :$base_label} + } + + ptr_inc_label: DW_TAG_pointer_type { + {DW_AT_byte_size $addr_size DW_FORM_udata} + {DW_AT_type :$incomplete_label} + } + + ptr_comp_label: DW_TAG_pointer_type { + {DW_AT_byte_size $addr_size DW_FORM_udata} + {DW_AT_type :$complete_label} + } + + ptr_int_label: DW_TAG_pointer_type { + {DW_AT_byte_size $addr_size DW_FORM_udata} + {DW_AT_type :$int_label} + } + + DW_TAG_variable { + {DW_AT_name "comp"} + {DW_AT_type :$complete_label} + {DW_AT_location {DW_OP_addr [gdb_target_symbol "comp"]} SPECIAL_expr} + {DW_AT_external 1 DW_FORM_flag} + } + + DW_TAG_variable { + {DW_AT_name "cp"} + {DW_AT_type :$ptr_comp_label} + {DW_AT_location {DW_OP_addr [gdb_target_symbol "cp"]} SPECIAL_expr} + {DW_AT_external 1 DW_FORM_flag} + } + + DW_TAG_variable { + {DW_AT_name "inc"} + {DW_AT_type :$ptr_inc_label} + {DW_AT_location {DW_OP_addr [gdb_target_symbol "inc"]} SPECIAL_expr} + {DW_AT_external 1 DW_FORM_flag} + } + + DW_TAG_variable { + {DW_AT_name "ip"} + {DW_AT_type :$ptr_int_label} + {DW_AT_location {DW_OP_addr [gdb_target_symbol "ip"]} SPECIAL_expr} + {DW_AT_external 1 DW_FORM_flag} + } + + DW_TAG_subprogram { + {MACRO_AT_func {"main"}} + {DW_AT_external 1 flag} + } + DW_TAG_subprogram { + {MACRO_AT_func {"foo"}} + {DW_AT_type :$int_label} + {DW_AT_external 1 flag} + } { formal_parameter { + {DW_AT_name "b"} + {DW_AT_type :$ptr_base_label} + } + } + } + } + + lines {version 2} L { + include_dir "$srcdir/$subdir" + file_name $srcfile 1 + } +} + +if [prepare_for_testing "failed to prepare" $testfile [list $asm_file $srcfile] {}] { + return +} + +if ![runto_main] { + return +} + +gdb_test "print foo(cp)" "= 1" "successful invocation" +gdb_test "print foo(inc)"\ + "The type. 'incomplete .' isn't fully known to GDB.*"\ + "unsuccessful because declaration" +gdb_test "print foo(ip)"\ + "Cannot resolve function foo to any overloaded instance."\ + "unsuccessful because incorrect" diff --git a/gdb/valops.c b/gdb/valops.c index ecfceed199a..2b789cd76f4 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -41,6 +41,7 @@ #include "extension.h" #include "gdbtypes.h" #include "gdbsupport/byte-vector.h" +#include "typeprint.h" /* Local functions. */ @@ -2617,6 +2618,49 @@ value_find_oload_method_list (struct value **argp, const char *method, basetype, boffset); } +/* Helper function for find_overload_match. If no matches were + found, this function may generate a hint for the user that some + of the relevant types are incomplete, so GDB can't evaluate + type relationships to properly evaluate overloads. + + If no incomplete types are present, an empty string is returned. */ +static std::string +incomplete_type_hint (gdb::array_view args) +{ + int incomplete_types = 0; + std::string incomplete_arg_names; + for (const struct value *arg : args) + { + struct type *t = value_type (arg); + while (t->code () == TYPE_CODE_PTR) + t = t->target_type (); + if (t->is_stub ()) + { + string_file buffer; + if (incomplete_types > 0) + incomplete_arg_names += ", "; + + current_language->print_type (value_type (arg), "", &buffer, + -1, 0, &type_print_raw_options); + + incomplete_types++; + incomplete_arg_names += buffer.string (); + } + } + std::string hint; + if (incomplete_types > 1) + hint = string_printf (_("\nThe types: '%s' aren't fully known to GDB." + " Please cast them directly to the desired" + " typed in the function call."), + incomplete_arg_names.c_str ()); + else if (incomplete_types == 1) + hint = string_printf (_("\nThe type: '%s' isn't fully known to GDB." + " Please cast it directly to the desired" + " typed in the function call."), + incomplete_arg_names.c_str ()); + return hint; +} + /* Given an array of arguments (ARGS) (which includes an entry for "this" in the case of C++ methods), the NAME of a function, and whether it's a method or not (METHOD), find the best function that @@ -2933,14 +2977,15 @@ find_overload_match (gdb::array_view args, if (match_quality == INCOMPATIBLE) { + std::string hint = incomplete_type_hint (args); if (method == METHOD) - error (_("Cannot resolve method %s%s%s to any overloaded instance"), + error (_("Cannot resolve method %s%s%s to any overloaded instance.%s"), obj_type_name, (obj_type_name && *obj_type_name) ? "::" : "", - name); + name, hint.c_str ()); else - error (_("Cannot resolve function %s to any overloaded instance"), - func_name); + error (_("Cannot resolve function %s to any overloaded instance.%s"), + func_name, hint.c_str ()); } else if (match_quality == NON_STANDARD) {