From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 8K3TI3IJg2YtURcAWB0awg (envelope-from ) for ; Mon, 01 Jul 2024 15:54:26 -0400 Authentication-Results: simark.ca; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ghGoqfj4; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 84E8C1E0C3; Mon, 1 Jul 2024 15:54:26 -0400 (EDT) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 737341E030 for ; Mon, 1 Jul 2024 15:54:24 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 27FDD38114DB for ; Mon, 1 Jul 2024 19:54:24 +0000 (GMT) Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by sourceware.org (Postfix) with ESMTPS id 7721C3858CDA for ; Mon, 1 Jul 2024 19:54:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7721C3858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7721C3858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719863644; cv=none; b=bg/XTEBTi6PlHbuGKM4mw4kfrEtpVEo6HJbKupRNpnn27skahtZf0+iXNJ7I5TWobEc6opDPNhorzMucc4fVdWJyhGrGg90iYETgHji9DGDMVF+DW349LB6I6/t1cRjIllWVZAAQR80V6mt4M52X/MJAhkqU8MIkC5Al3ZdBD3g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1719863644; c=relaxed/simple; bh=ZeTZ+7Jp9gteCIloUrRYyy6XU5RphFf9f+eufyAk+kA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=PtQ4pr1Dj7i8bvfGydS3TisJoC8tuNUK6fSIQt9VaA4Yz9Io+dm6fCE+dzvZl7B5+DOLOSh9IBYKezaEvMLLY18CU6/cIq5mzPaHj5QLE8nWVuyvwWaeyliqgWbCZAhS8HmTXKRc7j76m4Xj+54hvrIdSQjym8CmPsDzbJ4FnSg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-701b0b0be38so2773740b3a.0 for ; Mon, 01 Jul 2024 12:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719863641; x=1720468441; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TSI26+oxdmZqduUDrz43tuHEAeoqjzo7MStmaMzYC+k=; b=ghGoqfj4HhIDgN/GkTGDMD5AIaaKZJS2OvalrShskGDu05fOn4YzEfD3UVzR69sw5n sfA196sZkb6jGcT1bL2BTPtpCe4o6Aa2JZNGtGapGuENDVBnmg7zVr8Ld5dNVhdKoOT0 lodzAjxmnI0dgsZA087IDM5l1kjRRbNzH1kfyWMmwofQLYkWdJb1JVjAN7Ox/JUJ9EqG WF3Z0kN4Jh/TG5pA0boNSOcuIG7seEFxDqtTJFrLiitMopIcmGYtP1W4RFHgyzoMKHVE g1fz0ieE8hk4B9IqGHjPSosKNmHuEVxBg/R4Ke00BW2QWYrPyNqdvqP83VldVHJwzWkA pMGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719863641; x=1720468441; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TSI26+oxdmZqduUDrz43tuHEAeoqjzo7MStmaMzYC+k=; b=KTwgmhKbsrSs2s4NJOLSNyvKkrXAvoL6n96jxKHS+bFLYC/FmMg6siBjhR3M7/J07Z XNEpPXfvCwxSuqJUTtM2GhEls6dkU335Rysv3v6s279dzXUG6U1O8SOO+rUm1LQ3irt4 +7RPsQZrdbXJP5Df/b3ex8TgcwrQJRqBO0Sb0BOahWK2o8sdjQFkzJ5qPdJcKB3GUHTu JU5uJVyha/E0MWQ6Da4CfVRXHP5TlZaiSITA9arXwIJyV4exVNVIafkdLagiqp1B49k2 FiNGv+XNoYEfT30agXEc6yQxrhYkDsK3sdDIIa91hSQE4Jb8/tkot/YwzOITsx9Ktovm g6OA== X-Gm-Message-State: AOJu0YxkM+9MMrA6lxK+ApvKNEpVZvIhqOwNvCW1jX09NTNzCGziVQwU N0PXDMte3rNNtPX8oOusbKa+3S0q+HMDaHulPgTWgd/kUl1FO+8CytvKOw== X-Google-Smtp-Source: AGHT+IFha6fI/QbhSXEKxnv0JxIwPenBbMBhriclvpbV5buQZVqGR5Gc/3A1rQyXl3Zsdw1cF3OaXQ== X-Received: by 2002:a05:6a20:9191:b0:1be:d260:93c1 with SMTP id adf61e73a8af0-1bef60fce2bmr11116454637.9.1719863640481; Mon, 01 Jul 2024 12:54:00 -0700 (PDT) Received: from valdaarhun.. ([223.233.84.154]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fac10d1fb1sm68639355ad.36.2024.07.01.12.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 12:54:00 -0700 (PDT) From: Sahil Siddiq X-Google-Original-From: Sahil Siddiq To: gdb-patches@sourceware.org Cc: Sahil Siddiq Subject: [PATCH v2] gdb: fix "frame function" issue when call is last instruction Date: Tue, 2 Jul 2024 01:23:21 +0530 Message-ID: <20240701195321.16591-1-sahilcdq@proton.me> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_NONE, SPF_PASS, 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.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org Currently, the "frame function" fails when the last instruction is a call. In such a case, the $rip register points to an address that lies outside the frame. Using "get_frame_address_in_block" instead of "get_frame_pc" resolves this issue. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30929 --- Changes since v1: * frame-selection-last-instr-call.exp: Modify test to fix regressions on arm/aarch64 Patch v1: https://sourceware.org/pipermail/gdb-patches/2024-June/210251.html gdb/stack.c | 4 +- .../frame-selection-last-instr-call.c | 28 ++++ .../frame-selection-last-instr-call.exp | 130 ++++++++++++++++++ 3 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.base/frame-selection-last-instr-call.c create mode 100644 gdb/testsuite/gdb.base/frame-selection-last-instr-call.exp diff --git a/gdb/stack.c b/gdb/stack.c index b36193be2f..8249866468 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -2860,8 +2860,8 @@ find_frame_for_function (const char *function_name) do { for (size_t i = 0; (i < sals.size () && !found); i++) - found = (get_frame_pc (frame) >= func_bounds[i].low - && get_frame_pc (frame) < func_bounds[i].high); + found = (get_frame_address_in_block (frame) >= func_bounds[i].low + && get_frame_address_in_block (frame) < func_bounds[i].high); if (!found) { level = 1; diff --git a/gdb/testsuite/gdb.base/frame-selection-last-instr-call.c b/gdb/testsuite/gdb.base/frame-selection-last-instr-call.c new file mode 100644 index 0000000000..4f056332af --- /dev/null +++ b/gdb/testsuite/gdb.base/frame-selection-last-instr-call.c @@ -0,0 +1,28 @@ +/* Copyright 2024 Free Software Foundation, Inc. + + This file is part of GDB. + + 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 +frame_1 (void) +{ + __builtin_abort(); +} + +int +main (void) +{ + frame_1 (); +} diff --git a/gdb/testsuite/gdb.base/frame-selection-last-instr-call.exp b/gdb/testsuite/gdb.base/frame-selection-last-instr-call.exp new file mode 100644 index 0000000000..5ba52cc069 --- /dev/null +++ b/gdb/testsuite/gdb.base/frame-selection-last-instr-call.exp @@ -0,0 +1,130 @@ +# Copyright 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 . + +# This tests GDB's frame selection as used by the 'frame', +# 'select-frame', and 'info frame' commands in the corner case +# when the last instruction in a frame is a call. + +standard_testfile + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} { + return -1 +} + +runto_main +gdb_breakpoint abort +gdb_continue_to_breakpoint abort + +gdb_test "bt" "#0 $hex in abort .*#1 $hex in frame_1 .*#2 $hex in main.*" "backtrace at breakpoint" + +# Perform "info frame" to extract the frame's address. +proc get_frame_address { {testname ""} } { + global hex gdb_prompt + + set frame_address "unknown" + set testname "get_frame_address: ${testname}" + gdb_test_multiple "info frame" $testname { + -re ", frame at ($hex):\r\n.*\r\n$gdb_prompt $" { + set frame_address $expect_out(1,string) + pass $testname + } + } + + return $frame_address +} + +# Check that the current frame is at stack depth LEVEL, at frame +# address ADDRESS, and is in FUNCTION. +proc check_frame { level address function } { + global hex gdb_prompt + + set re [multi_line \ + "Stack level ${level}, frame at ($address):" \ + ".* = $hex in ${function}( \(\[^\r\n\]*\))*; saved .* = $hex" \ + ".*\r\n$gdb_prompt $" ] + + set testname "check frame level ${level}" + gdb_test_multiple "info frame" $testname { + -re $re { + pass $testname + } + } +} + +# Select frame using level, but relying on this being the default +# action, so "frame 0" performs "frame level 0". +gdb_test "frame 0" "#0 $hex in abort.*" +set frame_0_address [ get_frame_address "frame 0" ] +gdb_test "frame 1" "#1 $hex in frame_1.*" +set frame_1_address [ get_frame_address "frame 1" ] +gdb_test "frame 2" "#2 $hex in main.*" +set frame_2_address [ get_frame_address "frame 2" ] + +# Select frame using 'level' specification. +gdb_test "frame level 0" "#0 $hex in abort.*" +gdb_test "frame level 1" "#1 $hex in frame_1.*" +gdb_test "frame level 2" "#2 $hex in main.*" + +# Select frame by address. +gdb_test "frame address ${frame_0_address}" "#0 $hex in abort.*" \ + "select frame 0 by address" +gdb_test "frame address ${frame_1_address}" "#1 $hex in frame_1.*" \ + "select frame 1 by address" +gdb_test "frame address ${frame_2_address}" "#2 $hex in main.*" \ + "select frame 2 by address" + +# Select frame by function. +gdb_test "frame function abort" "#0 $hex in abort.*" +gdb_test "frame function frame_1" "#1 $hex in frame_1.*" +gdb_test "frame function main" "#2 $hex in main.*" + +with_test_prefix "select-frame, no keyword" { + gdb_test_no_output "select-frame 0" + check_frame "0" "${frame_0_address}" "abort" + gdb_test_no_output "select-frame 1" + check_frame "1" "${frame_1_address}" "frame_1" + gdb_test_no_output "select-frame 2" + check_frame "2" "${frame_2_address}" "main" +} + +with_test_prefix "select-frame, keyword=level" { + gdb_test_no_output "select-frame level 0" + check_frame "0" "${frame_0_address}" "abort" + gdb_test_no_output "select-frame level 1" + check_frame "1" "${frame_1_address}" "frame_1" + gdb_test_no_output "select-frame level 2" + check_frame "2" "${frame_2_address}" "main" +} + +with_test_prefix "select-frame, keyword=address" { + gdb_test_no_output "select-frame address ${frame_0_address}" \ + "select frame 0 by address" + check_frame "0" "${frame_0_address}" "abort" + gdb_test_no_output "select-frame address ${frame_1_address}" \ + "select frame 1 by address" + check_frame "1" "${frame_1_address}" "frame_1" + gdb_test_no_output "select-frame address ${frame_2_address}" \ + "select frame 2 by address" + check_frame "2" "${frame_2_address}" "main" +} + +with_test_prefix "select-frame, keyword=function" { + gdb_test_no_output "select-frame function abort" + check_frame "0" "${frame_0_address}" "abort" + gdb_test_no_output "select-frame function frame_1" + check_frame "1" "${frame_1_address}" "frame_1" + gdb_test_no_output "select-frame function main" + check_frame "2" "${frame_2_address}" "main" +} -- 2.45.2