From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 30A2D3858D35 for ; Mon, 22 Apr 2024 15:53:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 30A2D3858D35 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 30A2D3858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713801199; cv=none; b=mDM56q3pdfeebMkwIrziConYonUaMeFWHTxgdvBZOoyuoVeprYvHLJ8QGbJy/OD203xtKjJab9QCNXPOCiETpWKTAiijsbt5WnGcT4REU52m8ZqA2IQTjkvEbv6bDafCsmkpKnAU4wMpLeUc6UaCSTuI5RUprlMRC1uZtc4u/mc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713801199; c=relaxed/simple; bh=BkyPso1ejOvKDys466DaSyH4ZZBhKjtDi/KWjqjY9zs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Bwwvu2sPmnL+dE3vU1K7F+LsYGkxDEW6kZrAQI3iTsiyWBGw1TwXxOaChv++tuW+YGSQ1D9yTUHf32YuZYXDOf7MNO/IWyViBVw+4ahMf6wP66wsQEZrupq0rQ7U+lJQiSXHCD3Z9ckf9JIeKmiENsvZq/4XPp2CSa6ILWoerqM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713801195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3fq2Yrv83U73oH4jjtAPeae7dRdF5HIe8xZa5Pxobx8=; b=QW/YyGAwNvKXE3lDfSUc8YG+3mwLIVSZ9MOPL1cq+XUi5bCGdI6acG55MPMJVhDPCqUSus 7Kyh2j9Q/qr81+xraiOYqr7ABt5OwSupp+ea0qodxAiKHOTEsXS/CSLkCxECYy2ctCYKqZ zW24H/q+4xCzt4Gtrp5qDPwV8+aLHqI= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-682-NLNoq9rEOnipmktlo3akrA-1; Mon, 22 Apr 2024 09:39:39 -0400 X-MC-Unique: NLNoq9rEOnipmktlo3akrA-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-41a54b30c86so4488935e9.0 for ; Mon, 22 Apr 2024 06:39:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713793177; x=1714397977; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3fq2Yrv83U73oH4jjtAPeae7dRdF5HIe8xZa5Pxobx8=; b=Uo3gaxlmzYs1/kFWzFfzE/lXt9XdcNZBhiLxXqWD8r2SfWV9jgbfjswaBVfDwhEVsC TklGQsO+pHAchcYxnQsZhfgfm9AWpMGq6bcD4n7MUsVhWc8FNqm/I2sO1BYSWqhpidg6 Snc5IiFhsBXj401popOtcz8Y43T6tLaqAKBpOaaa0f7vIIqiC2S+W6avXj6N91BvSna5 HQjBECtvn2RrnK70BJaYd3Q/yctgfDHAHOQIC5HW1GIyCrl37vQS1FE0vE/XX/BNuaL6 eJJEyWkU6phwyEiFvaCB6gfz02dG0kuf2VNo40hGTDjdSDRITqINbNk1vjpXkm8YpKUl i5sw== X-Forwarded-Encrypted: i=1; AJvYcCUIffNoxnmr6mCb7hQb7eh9F1+esaSAMs0cZE7uOD1ytJ350aOu/ZMcbSdQKf92pZRpYO2qUQ6WDRwQc/Phbac4ouBzKkgXehq5iw== X-Gm-Message-State: AOJu0YwxqZIEk3QCra/TkupXyzuNUi9mQuyZmA5Eijfif9mTZYPjoqyE bTx7vGYb2B02XNVBj518xb2bQ8zDyhfnO6xPSbkfoiBkGlH/85b7pb95Y3cZapqw76MKs7HZBn7 vZ7uAJ0fKV8NPWH8g/pQ7fwEsPb80tmJZDbfPjddOTJApbAL1L3Uv3X9qQ/DQBBgoN+A= X-Received: by 2002:a05:600c:1d22:b0:41a:8b39:5ca9 with SMTP id l34-20020a05600c1d2200b0041a8b395ca9mr833730wms.18.1713793177192; Mon, 22 Apr 2024 06:39:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0+5ipkwa6J8+QazKdSnJzqe0UocfEMic/qmLFdzyflLOObFlyPci4UG6xfgEg1fChcinxhQ== X-Received: by 2002:a05:600c:1d22:b0:41a:8b39:5ca9 with SMTP id l34-20020a05600c1d2200b0041a8b395ca9mr833703wms.18.1713793176400; Mon, 22 Apr 2024 06:39:36 -0700 (PDT) Received: from localhost (185.223.159.143.dyn.plus.net. [143.159.223.185]) by smtp.gmail.com with ESMTPSA id g9-20020a05600c310900b0041a9fc2a6b5sm32309wmo.20.2024.04.22.06.39.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 06:39:36 -0700 (PDT) From: Andrew Burgess To: Tom de Vries , gdb-patches@sourceware.org Subject: Re: [PATCH v5 2/2] [gdb/symtab] Handle two-linetable function in find_epilogue_using_linetable In-Reply-To: <20240409092753.10567-2-tdevries@suse.de> References: <20240409092753.10567-1-tdevries@suse.de> <20240409092753.10567-2-tdevries@suse.de> Date: Mon, 22 Apr 2024 14:39:35 +0100 Message-ID: <8734rdh5yg.fsf@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.2 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_H4,RCVD_IN_MSPIKE_WL,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 List-Id: Tom de Vries writes: > From: Bernd Edlinger > > Consider the following test-case: > ... > $ cat hello.c > int main() > { > printf("hello "); > #include "world.inc" > $ cat world.inc > printf("world\n"); > return 0; > } > $ gcc -g hello.c > ... > > The line table for the compilation unit, consisting just of > function main, is translated into these two gdb line tables, one for hello.c > and one for world.inc: > ... > compunit_symtab: hello.c > symtab: hello.c > INDEX LINE REL-ADDRESS UNREL-ADDRESS IS-STMT PROLOGUE-END EPILOGUE-BEGIN > 0 3 0x400557 0x400557 Y > 1 4 0x40055b 0x40055b Y > 2 END 0x40056a 0x40056a Y > > compunit_symtab: hello.c > symtab: world.inc > INDEX LINE REL-ADDRESS UNREL-ADDRESS IS-STMT PROLOGUE-END EPILOGUE-BEGIN > 0 1 0x40056a 0x40056a Y > 1 2 0x400574 0x400574 Y > 2 3 0x400579 0x400579 Y > 3 END 0x40057b 0x40057b Y > ... > > The epilogue of main starts at 0x400579: > ... > 400579: 5d pop %rbp > 40057a: c3 ret > ... > > Now, say we have an epilogue_begin marker in the line table at 0x400579. > > We won't find it using find_epilogue_using_linetable, because it does: > ... > const struct symtab_and_line sal = find_pc_line (start_pc, 0); > ... > which gets us the line table for hello.c. > > Fix this by using "find_pc_line (end_pc - 1, 0)" instead. > > Tested on x86_64-linux. > > Co-Authored-By: Tom de Vries LGTM. Approved-By: Andrew Burgess Thanks, Andrew > > PR symtab/31622 > Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31622 > --- > gdb/symtab.c | 11 +- > .../gdb.dwarf2/dw2-epilogue-begin-2.exp | 20 ++ > .../gdb.dwarf2/dw2-epilogue-begin.c.inc | 51 +++++ > .../gdb.dwarf2/dw2-epilogue-begin.exp | 157 +------------- > .../gdb.dwarf2/dw2-epilogue-begin.exp.tcl | 199 ++++++++++++++++++ > gdb/testsuite/lib/dwarf.exp | 5 +- > 6 files changed, 284 insertions(+), 159 deletions(-) > create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin-2.exp > create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.c.inc > create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl > > diff --git a/gdb/symtab.c b/gdb/symtab.c > index e032178aaa6..034f71226b6 100644 > --- a/gdb/symtab.c > +++ b/gdb/symtab.c > @@ -4158,8 +4158,15 @@ find_epilogue_using_linetable (CORE_ADDR func_addr) > > /* While the standard allows for multiple points marked with epilogue_begin > in the same function, for performance reasons, this function will only > - find the last address that sets this flag for a given block. */ > - const struct symtab_and_line sal = find_pc_line (start_pc, 0); > + find the last address that sets this flag for a given block. > + > + The lines of a function can be described by several line tables in case > + there are different files involved. There's a corner case where a > + function epilogue is in a different file than a function start, and using > + start_pc as argument to find_pc_line will mean we won't find the > + epilogue. Instead, use "end_pc - 1" to maximize our changes of picking > + the line table containing an epilogue. */ > + const struct symtab_and_line sal = find_pc_line (end_pc - 1, 0); > if (sal.symtab != nullptr && sal.symtab->language () != language_asm) > { > struct objfile *objfile = sal.symtab->compunit ()->objfile (); > diff --git a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin-2.exp > new file mode 100644 > index 00000000000..6302ef1ad05 > --- /dev/null > +++ b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin-2.exp > @@ -0,0 +1,20 @@ > +# Copyright 2022-2024 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 . > + > +standard_testfile dw2-epilogue-begin.c dw2-epilogue-begin.S > + > +set version 2 > + > +source $srcdir/$subdir/dw2-epilogue-begin.exp.tcl > diff --git a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.c.inc b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.c.inc > new file mode 100644 > index 00000000000..4ff445cf37d > --- /dev/null > +++ b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.c.inc > @@ -0,0 +1,51 @@ > +/* Copyright 2023-2024 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 . */ > + > +void > +__attribute__((used)) > +trivial (void) > +{ > + asm ("trivial_label: .global trivial_label"); /* trivial function */ > +} > + > +char global; > + > +void > +watch (void) > +{ /* watch start */ > + asm ("watch_label: .global watch_label"); > + asm ("mov $0x0, %rax"); > + int local = 0; /* watch prologue */ > + > + asm ("watch_start: .global watch_start"); > + asm ("mov $0x1, %rax"); > + local = 1; /* watch assign */ > + asm ("watch_reassign: .global watch_reassign"); > + asm ("mov $0x2, %rax"); > + local = 2; /* watch reassign */ > + asm ("watch_end: .global watch_end"); /* watch end */ > +} > + > +int > +main (void) > +{ /* main prologue */ > + asm ("main_label: .global main_label"); > + global = 0; > + asm ("main_fun_call: .global main_fun_call"); > + watch (); /* main function call */ > + asm ("main_epilogue: .global main_epilogue"); > + global = 10; > + return 0; /* main end */ > +} > diff --git a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp > index f646e23da62..9b9d6c71de4 100644 > --- a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp > +++ b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp > @@ -13,161 +13,8 @@ > # You should have received a copy of the GNU General Public License > # along with this program. If not, see . > > -# Check that GDB can honor the epilogue_begin flag the compiler can place > -# in the line-table data. > -# We test 2 things: 1. that a software watchpoint triggered in an epilogue > -# is correctly ignored > -# 2. that GDB can mark the same line as both prologue and epilogue > - > -load_lib dwarf.exp > - > -# This test can only be run on targets which support DWARF-2 and use gas. > -require dwarf2_support > -# restricted to x86 to make it simpler to follow a variable > -require is_x86_64_m64_target > - > standard_testfile .c .S > > -set trivial_line [gdb_get_line_number "trivial function"] > -set main_prologue [gdb_get_line_number "main prologue"] > -set main_epilogue [gdb_get_line_number "main end"] > -set watch_start_line [gdb_get_line_number "watch start"] > - > -set asm_file [standard_output_file $srcfile2] > - > -# The producer will be set to clang because at the time of writing > -# we only care about epilogues if the producer is clang. When the > -# producer is GCC, variables use CFA locations, so watchpoints can > -# continue working even on epilogues. > -Dwarf::assemble $asm_file { > - global srcdir subdir srcfile srcfile2 > - global trivial_line main_prologue main_epilogue watch_start_line > - declare_labels lines_label > - > - get_func_info main > - get_func_info trivial > - get_func_info watch > - > - cu {} { > - compile_unit { > - {language @DW_LANG_C} > - {name dw2-prologue-end.c} > - {stmt_list ${lines_label} DW_FORM_sec_offset} > - {producer "clang version 17.0.1"} > - } { > - declare_labels char_label > - > - char_label: base_type { > - {name char} > - {encoding @DW_ATE_signed} > - {byte_size 1 DW_FORM_sdata} > - } > - > - subprogram { > - {external 1 flag} > - {name trivial} > - {low_pc $trivial_start addr} > - {high_pc "$trivial_start + $trivial_len" addr} > - } > - subprogram { > - {external 1 flag} > - {name watch} > - {low_pc $watch_start addr} > - {high_pc "$watch_start + $watch_len" addr} > - } { > - DW_TAG_variable { > - {name local} > - {type :$char_label} > - {DW_AT_location {DW_OP_reg0} SPECIAL_expr} > - } > - } > - subprogram { > - {external 1 flag} > - {name main} > - {low_pc $main_start addr} > - {high_pc "$main_start + $main_len" addr} > - } > - } > - } > - > - lines {version 5} lines_label { > - set diridx [include_dir "${srcdir}/${subdir}"] > - file_name "$srcfile" $diridx > - > - program { > - DW_LNS_set_file $diridx > - DW_LNE_set_address $trivial_start > - line $trivial_line > - DW_LNS_set_prologue_end > - DW_LNS_set_epilogue_begin > - DW_LNS_copy > - > - DW_LNE_set_address watch > - line $watch_start_line > - DW_LNS_copy > - > - DW_LNE_set_address watch_start > - line [gdb_get_line_number "watch assign"] > - DW_LNS_set_prologue_end > - DW_LNS_copy > - > - DW_LNE_set_address watch_reassign > - line [gdb_get_line_number "watch reassign"] > - DW_LNS_set_epilogue_begin > - DW_LNS_copy > - > - DW_LNE_set_address watch_end > - line [gdb_get_line_number "watch end"] > - DW_LNS_copy > - > - DW_LNE_set_address $main_start > - line $main_prologue > - DW_LNS_set_prologue_end > - DW_LNS_copy > - > - DW_LNE_set_address main_fun_call > - line [gdb_get_line_number "main function call"] > - DW_LNS_copy > - > - DW_LNE_set_address main_epilogue > - line $main_epilogue > - DW_LNS_set_epilogue_begin > - DW_LNS_copy > - > - DW_LNE_end_sequence > - } > - } > -} > - > -if { [prepare_for_testing "failed to prepare" ${testfile} \ > - [list $srcfile $asm_file] {nodebug}] } { > - return -1 > -} > - > -if ![runto_main] { > - return -1 > -} > - > -# Moving to the scope with a local variable. > -gdb_breakpoint $watch_start_line > -gdb_continue_to_breakpoint "continuing to function" ".*" > -gdb_test "next" "local = 2.*" "stepping to epilogue" > - > -# Forcing software watchpoints because hardware ones don't care if we > -# are in the epilogue or not. > -gdb_test_no_output "set can-use-hw-watchpoints 0" > - > -# Test that the software watchpoint will not trigger in this case > -gdb_test "watch local" "\[W|w\]atchpoint .: local" "set watchpoint" > -gdb_test "continue" ".*\[W|w\]atchpoint . deleted.*" \ > - "confirm watchpoint doesn't trigger" > +set version 1 > > -# First we test that the trivial function has a line with both a prologue > -# and an epilogue. Do this by finding a line that has 3 Y columns > -set sep "\[ \t\]" > -set hex_number "0x\[0-9a-f\]+" > -gdb_test_multiple "maint info line-table" "test epilogue in linetable" -lbl { > - -re "\[0-9\]$sep+$trivial_line$sep+$hex_number$sep+$hex_number$sep+Y$sep+Y$sep+Y" { > - pass $gdb_test_name > - } > -} > +source $srcdir/$subdir/dw2-epilogue-begin.exp.tcl > diff --git a/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl > new file mode 100644 > index 00000000000..155916b92df > --- /dev/null > +++ b/gdb/testsuite/gdb.dwarf2/dw2-epilogue-begin.exp.tcl > @@ -0,0 +1,199 @@ > +# Copyright 2022-2024 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 . > + > +# Check that GDB can honor the epilogue_begin flag the compiler can place > +# in the line-table data. > +# We test 2 things: 1. that a software watchpoint triggered in an epilogue > +# is correctly ignored > +# 2. that GDB can mark the same line as both prologue and epilogue > + > +load_lib dwarf.exp > + > +# This test can only be run on targets which support DWARF-2 and use gas. > +require dwarf2_support > +# restricted to x86 to make it simpler to follow a variable > +require is_x86_64_m64_target > + > +set trivial_line [gdb_get_line_number "trivial function"] > +set main_prologue [gdb_get_line_number "main prologue"] > +set main_epilogue [gdb_get_line_number "main end"] > +set watch_start_line [gdb_get_line_number "watch start"] > + > +set asm_file [standard_output_file $srcfile2] > + > +# The producer will be set to clang because at the time of writing > +# we only care about epilogues if the producer is clang. When the > +# producer is GCC, variables use CFA locations, so watchpoints can > +# continue working even on epilogues. > +Dwarf::assemble $asm_file { > + global srcdir subdir srcfile srcfile2 > + global trivial_line main_prologue main_epilogue watch_start_line > + declare_labels lines_label > + > + get_func_info main > + get_func_info trivial > + get_func_info watch > + > + if { $::version == 1 } { > + set switch_file {} > + } elseif { $::version == 2 } { > + set switch_file { set f $f2 } > + } else { > + error "Unhandled version: $::version" > + } > + > + cu {} { > + compile_unit { > + {language @DW_LANG_C} > + {name dw2-prologue-end.c} > + {stmt_list ${lines_label} DW_FORM_sec_offset} > + {producer "clang version 17.0.1"} > + } { > + declare_labels char_label > + > + char_label: base_type { > + {name char} > + {encoding @DW_ATE_signed} > + {byte_size 1 DW_FORM_sdata} > + } > + > + subprogram { > + {external 1 flag} > + {name trivial} > + {low_pc $trivial_start addr} > + {high_pc "$trivial_start + $trivial_len" addr} > + } > + subprogram { > + {external 1 flag} > + {name watch} > + {low_pc $watch_start addr} > + {high_pc "$watch_start + $watch_len" addr} > + } { > + DW_TAG_variable { > + {name local} > + {type :$char_label} > + {DW_AT_location {DW_OP_reg0} SPECIAL_expr} > + } > + } > + subprogram { > + {external 1 flag} > + {name main} > + {low_pc $main_start addr} > + {high_pc "$main_start + $main_len" addr} > + } > + } > + } > + > + lines {version 5} lines_label { > + set diridx [include_dir "${srcdir}/${subdir}"] > + set f1 [file_name "$srcfile" $diridx] > + set f2 [file_name "$srcfile.inc" $diridx] > + > + set f $f1 > + program { > + DW_LNS_set_file $f > + > + DW_LNE_set_address $trivial_start > + line $trivial_line > + DW_LNS_set_prologue_end > + DW_LNS_set_epilogue_begin > + DW_LNS_copy > + > + DW_LNE_set_address $trivial_end > + DW_LNE_end_sequence > + > + > + DW_LNS_set_file $f > + > + DW_LNE_set_address $watch_start > + line $watch_start_line > + DW_LNS_copy > + > + DW_LNE_set_address watch_start > + line [gdb_get_line_number "watch assign"] > + DW_LNS_set_prologue_end > + DW_LNS_copy > + > + eval $switch_file > + DW_LNS_set_file $f > + > + DW_LNE_set_address watch_reassign > + line [gdb_get_line_number "watch reassign"] > + DW_LNS_set_epilogue_begin > + DW_LNS_copy > + > + DW_LNE_set_address watch_end > + line [gdb_get_line_number "watch end"] > + DW_LNS_copy > + > + DW_LNE_set_address $watch_end > + DW_LNE_end_sequence > + > + > + DW_LNS_set_file $f > + > + DW_LNE_set_address $main_start > + line $main_prologue > + DW_LNS_set_prologue_end > + DW_LNS_copy > + > + DW_LNE_set_address main_fun_call > + line [gdb_get_line_number "main function call"] > + DW_LNS_copy > + > + DW_LNE_set_address main_epilogue > + line $main_epilogue > + DW_LNS_set_epilogue_begin > + DW_LNS_copy > + > + DW_LNE_set_address $main_end > + DW_LNE_end_sequence > + } > + } > +} > + > +if { [prepare_for_testing "failed to prepare" ${testfile} \ > + [list $srcfile $asm_file] {nodebug}] } { > + return -1 > +} > + > +if ![runto_main] { > + return -1 > +} > + > +# Moving to the scope with a local variable. > + > +gdb_breakpoint $srcfile:$watch_start_line > +gdb_continue_to_breakpoint "continuing to function" ".*" > +gdb_test "next" "local = 2.*" "stepping to epilogue" > + > +# Forcing software watchpoints because hardware ones don't care if we > +# are in the epilogue or not. > +gdb_test_no_output "set can-use-hw-watchpoints 0" > + > +# Test that the software watchpoint will not trigger in this case > +gdb_test "watch local" "\[W|w\]atchpoint .: local" "set watchpoint" > +gdb_test "continue" ".*\[W|w\]atchpoint . deleted.*" \ > + "confirm watchpoint doesn't trigger" > + > +# First we test that the trivial function has a line with both a prologue > +# and an epilogue. Do this by finding a line that has 3 Y columns > +set sep "\[ \t\]" > +set hex_number "0x\[0-9a-f\]+" > +gdb_test_multiple "maint info line-table" "test epilogue in linetable" -lbl { > + -re "\[0-9\]$sep+$trivial_line$sep+$hex_number$sep+$hex_number$sep+Y$sep+Y$sep+Y" { > + pass $gdb_test_name > + } > +} > diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp > index d085f835f07..adc3a18ee4f 100644 > --- a/gdb/testsuite/lib/dwarf.exp > +++ b/gdb/testsuite/lib/dwarf.exp > @@ -2427,10 +2427,11 @@ namespace eval Dwarf { > variable _line_file_names > lappend _line_file_names $filename $diridx > > + set nr_filenames [expr [llength $_line_file_names] / 2] > if { $Dwarf::_line_unit_version >= 5 } { > - return [expr [llength $_line_file_names] - 1] > + return [expr $nr_filenames - 1] > } else { > - return [llength $_line_file_names] > + return $nr_filenames > } > } > > -- > 2.35.3