From patchwork Sun Jan 6 00:16:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 30970 Received: (qmail 64851 invoked by alias); 6 Jan 2019 00:20:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 64832 invoked by uid 89); 6 Jan 2019 00:20:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=ret_type, typical, sk:pyfini, sk:finishb X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.49.180) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 06 Jan 2019 00:20:38 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 46D0948CB3 for ; Sat, 5 Jan 2019 18:16:09 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id fw6rgfRKPYTGMfw6rgRQCX; Sat, 05 Jan 2019 18:16:09 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uNRwkudM3Ma+ZgJmrxXaBDyPPDL4ODiXOFprZX/hkvU=; b=PEOpX9rUqtYa06FjEcoYdJN4g4 6ANSatc+c7N/7sAo59lpeQXEFnjkVdn48vwZ0mRg1ab35dFfQ/EtlaIl59VTAqoT988Z9jJtr+3fc gx1FsJoSj1qFpeqWMW5xTspTS; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:45912 helo=bapiya) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gfw6q-0014SW-W6; Sat, 05 Jan 2019 18:16:09 -0600 From: Tom Tromey To: Joel Brobecker Cc: Tom Tromey , gdb-patches@sourceware.org Subject: Re: [PATCH] Fix crash in "finish" References: <20181229174922.19279-1-tom@tromey.com> <20190102065838.GB28188@adacore.com> Date: Sat, 05 Jan 2019 17:16:08 -0700 In-Reply-To: <20190102065838.GB28188@adacore.com> (Joel Brobecker's message of "Wed, 2 Jan 2019 10:58:38 +0400") Message-ID: <87y37yzlmf.fsf@tromey.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1.90 (gnu/linux) MIME-Version: 1.0 >>>>> "Joel" == Joel Brobecker writes: Joel> The patch looks good to me. Joel> I am wondering if we could have a Python test as well? How's this? Tom commit 905e6df1430e9451a04a98ff1827663efd243ad2 Author: Tom Tromey Date: Sat Dec 29 10:46:07 2018 -0700 Fix crash in "finish" PR gdb/28155 notes a crash in "finish" that occurs with a particular source file compiled by clang. The bug is the typical gdb problem of a missing call to check_typedef. clang emits a function whose return type is a typedef to void. get_return_value asserts that the return type is not void, but the callers were not using check_typedef first. gdb/ChangeLog 2019-01-05 Tom Tromey PR gdb/28155: * python/py-finishbreakpoint.c (bpfinishpy_init): Use check_typedef. * infcmd.c (finish_command_fsm_should_stop): Use check_typedef. (print_return_value): Likewise. gdb/testsuite/ChangeLog 2019-01-05 Tom Tromey PR gdb/28155: * gdb.dwarf2/typedef-void-finish.exp: New file. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4b60367ffb..5714143bb4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-01-05 Tom Tromey + + PR gdb/28155: + * python/py-finishbreakpoint.c (bpfinishpy_init): Use + check_typedef. + * infcmd.c (finish_command_fsm_should_stop): Use check_typedef. + (print_return_value): Likewise. + 2019-01-05 Tom Tromey * contrib/cleanup_check.py: Remove. diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 182960ab99..3c3add89ab 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1706,7 +1706,8 @@ print_return_value_1 (struct ui_out *uiout, struct return_value_info *rv) void print_return_value (struct ui_out *uiout, struct return_value_info *rv) { - if (rv->type == NULL || TYPE_CODE (rv->type) == TYPE_CODE_VOID) + if (rv->type == NULL + || TYPE_CODE (check_typedef (rv->type)) == TYPE_CODE_VOID) return; TRY @@ -1800,7 +1801,7 @@ finish_command_fsm_should_stop (struct thread_fsm *self, internal_error (__FILE__, __LINE__, _("finish_command: function has no target type")); - if (TYPE_CODE (rv->type) != TYPE_CODE_VOID) + if (TYPE_CODE (check_typedef (rv->type)) != TYPE_CODE_VOID) { struct value *func; diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index bc225823f5..6ad79cddb6 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -253,7 +253,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs) if (function != NULL) { struct type *ret_type = - TYPE_TARGET_TYPE (SYMBOL_TYPE (function)); + check_typedef (TYPE_TARGET_TYPE (SYMBOL_TYPE (function))); /* Remember only non-void return types. */ if (TYPE_CODE (ret_type) != TYPE_CODE_VOID) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7c5ee11c6c..a0ac6a84eb 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-01-05 Tom Tromey + + PR gdb/28155: + * gdb.dwarf2/typedef-void-finish.exp: New file. + 2018-12-28 Tom Tromey Simon Marchi diff --git a/gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp b/gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp new file mode 100644 index 0000000000..633409db51 --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/typedef-void-finish.exp @@ -0,0 +1,102 @@ +# Copyright 2019 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 . + +# PR gdb/21855 concerns a crash in "finish" where the function's +# return type is a typedef of void. + +load_lib dwarf.exp +load_lib gdb-python.exp + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + return 0 +} + +standard_testfile void-type.c typedef-void-finish.S + +# Make some DWARF for the test. +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcdir subdir srcfile + + set func_result [function_range func ${srcdir}/${subdir}/${srcfile}] + set func_start [lindex $func_result 0] + set func_length [lindex $func_result 1] + + set main_result [function_range main ${srcdir}/${subdir}/${srcfile}] + set main_start [lindex $main_result 0] + set main_length [lindex $main_result 1] + + cu {} { + DW_TAG_compile_unit { + {DW_AT_producer "GNU C 8.1"} + {DW_AT_language @DW_LANG_C} + {DW_AT_name void-type.c} + {DW_AT_comp_dir /tmp} + } { + declare_labels main_type void_typedef + + main_type: DW_TAG_base_type { + {DW_AT_byte_size 4 DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_signed} + } + + void_typedef: DW_TAG_typedef { + {name foo} + } + + DW_TAG_subprogram { + {name func} + {low_pc $func_start addr} + {high_pc "$func_start + $func_length" addr} + {type :$void_typedef} + } + DW_TAG_subprogram { + {name main} + {low_pc $main_start addr} + {high_pc "$main_start + $main_length" addr} + {type :$main_type} + } + } + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 +} + +if {![runto_main]} { + return -1 +} + +gdb_test "break func" "Breakpoint .*" \ + "set breakpoint in func" +gdb_continue_to_breakpoint "continue to func" + +set skip_python [skip_python_tests] +if {!$skip_python} { + gdb_test "python finishbp = gdb.FinishBreakpoint()" \ + "Temporary breakpoint.*" "set FinishBreakpoint" +} + +gdb_test "finish" [multi_line \ + "Run till exit from #0 $hex in func \\\(\\\)" \ + ".*$hex in main \\\(\\\)"] + +if {!$skip_python} { + gdb_test "python print (finishbp.return_value)" "None" \ + "check that return_value is None" +}