From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ICoRE7ang19pWAAAWB0awg (envelope-from ) for ; Sun, 11 Oct 2020 20:47:50 -0400 Received: by simark.ca (Postfix, from userid 112) id 475661EF79; Sun, 11 Oct 2020 20:47:50 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI autolearn=ham autolearn_force=no version=3.4.2 Received: from 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 5E1711EF6F for ; Sun, 11 Oct 2020 20:47:46 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2508E3844047; Mon, 12 Oct 2020 00:47:46 +0000 (GMT) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by sourceware.org (Postfix) with ESMTPS id 558E2384B00F for ; Mon, 12 Oct 2020 00:47:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 558E2384B00F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=palves.net Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=alves.ped@gmail.com Received: by mail-wr1-f52.google.com with SMTP id n6so16896893wrm.13 for ; Sun, 11 Oct 2020 17:47:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=o1pqZYNe6ZNshjfn4XPEfrWqI93ezQnBjSJvG9QY7iA=; b=KnHAzkUPpW49BdB4htA+X3jWxu+sY2Tt9y0oPykwyd13NMjQcdmiFY6/TTnzqr1PLM 0qG+dSIkq6awIsB/UvHZC5wtl4Z58zRdxCHHRfpaPjni60GAvtv+eza6bcpXdv4qDk5g x0MgycLEUgt+/1QE80ucC9Co7a7/92bDR46lPS4NHwak/RV3FBPscXMRCKWNP2en8kBs zImFq0NeWsCNURrb+C9tM0L1PuNgsc3yUBMhW9AbRWHxo4BXy7+KBUEp8hRfZ4wSx8dU /0C3DKRB3tn7cTcKjpzbpcR5dgWfbKuV84N5DVpWCYiYSlkrunT2P6Gwtp01SOs3kBWc XFRA== X-Gm-Message-State: AOAM530ILIfbnrFpIXWaTvqYOvzNW4y3+wBsnjTsMxn/SSI0XAw7j8cZ U/anLBZUFENrWzu+OdFhc8elm4BmOdI/Zg== X-Google-Smtp-Source: ABdhPJzDdTlkzV8QGZXPcGRT3Xb/LMclDTapyoxK7LGzGd8EcqHd9kiP1pSizUnUPFnzbNB9WCfeQw== X-Received: by 2002:adf:9793:: with SMTP id s19mr4871461wrb.139.1602463662638; Sun, 11 Oct 2020 17:47:42 -0700 (PDT) Received: from localhost ([2001:8a0:f91e:6d00:c80a:ea25:47ef:5f73]) by smtp.gmail.com with ESMTPSA id w5sm21653152wmg.42.2020.10.11.17.47.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Oct 2020 17:47:41 -0700 (PDT) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 3/5] gdb/testsuite/: Use -qualified in runto_main / mi_runto_main Date: Mon, 12 Oct 2020 01:47:30 +0100 Message-Id: <20201012004732.22999-4-pedro@palves.net> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20201012004732.22999-1-pedro@palves.net> References: <20201012004732.22999-1-pedro@palves.net> 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: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" In some runtimes, there may be a "main" function in some class or namespace. The breakpoint created by runto_main may therefore have unexpected locations on some other functions than the actual main. These breakpoint locations can unexpectedly get hit during tests and lead to failures. I saw this while playing with AMD's ROCm toolchain -- I wrote a board file to run the testsuite against device kernels. There, the runtime calls a "main" function before the device kernel code is reached: Thread 4 "bit_extract" hit Breakpoint 1, 0x00007ffeea140960 in lld::elf::LinkerDriver::main(llvm::ArrayRef) () from /opt/rocm/lib/libamd_comgr.so.1 (gdb) bt #0 0x00007ffeea140960 in lld::elf::LinkerDriver::main(llvm::ArrayRef) () from /opt/rocm/lib/libamd_comgr.so.1 #1 0x00007ffeea2257a5 in lld::elf::link(llvm::ArrayRef, bool, llvm::raw_ostream&, llvm::raw_ostream&) () from /opt/rocm/lib/libamd_comgr.so.1 #2 0x00007ffeea1bc374 in COMGR::linkWithLLD(llvm::ArrayRef, llvm::raw_ostream&, llvm::raw_ostream&) () from /opt/rocm/lib/libamd_comgr.so.1 #3 0x00007ffeea1bfb09 in COMGR::InProcessDriver::execute(llvm::ArrayRef) () from /opt/rocm/lib/libamd_comgr.so.1 #4 0x00007ffeea1c4da9 in COMGR::AMDGPUCompiler::linkToExecutable() () from /opt/rocm/lib/libamd_comgr.so.1 #5 0x00007ffeea1fde20 in dispatchCompilerAction(amd_comgr_action_kind_s, COMGR::DataAction*, COMGR::DataSet*, COMGR::DataSet*, llvm::raw_ostream&) () from /opt/rocm/lib/libamd_comgr.so.1 #6 0x00007ffeea203a87 in amd_comgr_do_action () from /opt/rocm/lib/libamd_comgr.so.1 ... To avoid that, pass "qualified" to runto, in runto_main, so that gdb_breakpoint ends up creating a breakpoint with -qualified. This avoids creating breakpoints locations for other unrelated "main" functions. Note: I first tried making runto itself use "-qualified", but that caused regressions in the gdb.ada/ tests, which use runto without specifying the whole fully-qualified function name (i.e., without the package). So I end up restricting the -qualified to runto_main/mi_runto_main. The gdb.base/ui-redirect.exp change is necessary because that testcase is looking at what "save breakpoint" generates. gdb/testsuite/ChangeLog: * gdb.base/ui-redirect.exp: Expect "break -qualified main" in saved breakpoints file. * gdb.guile/scm-breakpoint.exp: Expect "-qualified main" when inspecting breakpoint list. * lib/gdb.exp (runto_main): Add "qualified" to options. * lib/mi-support.exp (mi_runto_helper): Add 'qualified' parameter, and handle it. (mi_runto_main): Pass 1 as qualified argument. Change-Id: I51468359ab0a518f05f7c0394c97f7e33b45fe69 --- gdb/testsuite/gdb.base/ui-redirect.exp | 2 +- gdb/testsuite/gdb.guile/scm-breakpoint.exp | 2 +- gdb/testsuite/lib/gdb.exp | 2 +- gdb/testsuite/lib/mi-support.exp | 10 +++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.base/ui-redirect.exp b/gdb/testsuite/gdb.base/ui-redirect.exp index ef0a79178c7..9e0a694c798 100644 --- a/gdb/testsuite/gdb.base/ui-redirect.exp +++ b/gdb/testsuite/gdb.base/ui-redirect.exp @@ -47,7 +47,7 @@ gdb_breakpoint "foo" gdb_breakpoint "bar" set cmds [multi_line_input \ - "break main" \ + "break -qualified main" \ " commands" \ " print 1" \ " end" \ diff --git a/gdb/testsuite/gdb.guile/scm-breakpoint.exp b/gdb/testsuite/gdb.guile/scm-breakpoint.exp index 7545392452e..3bcd5c81546 100644 --- a/gdb/testsuite/gdb.guile/scm-breakpoint.exp +++ b/gdb/testsuite/gdb.guile/scm-breakpoint.exp @@ -43,7 +43,7 @@ proc test_bkpt_basic { } { gdb_scm_test_silent_cmd "guile (define blist (breakpoints))" \ "get breakpoint list 1" gdb_test "guile (print (car blist))" \ - "" \ + "" \ "check main breakpoint" gdb_test "guile (print (breakpoint-location (car blist)))" \ "main" "check main breakpoint location" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 608469953bf..4c9675f255f 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -689,7 +689,7 @@ proc runto { function args } { # If you don't want that, use gdb_start_cmd. proc runto_main { } { - return [runto main no-message] + return [runto main no-message qualified] } ### Continue, and expect to hit a breakpoint. diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 732aed27b27..693c7d2c467 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -1056,7 +1056,7 @@ proc mi_run_to_main { } { # -1 if test suppressed, failed, timedout # 0 if test passed -proc mi_runto_helper {func run_or_continue} { +proc mi_runto_helper {func run_or_continue {qualified 0}} { global suppress_flag if { $suppress_flag } { return -1 @@ -1068,7 +1068,11 @@ proc mi_runto_helper {func run_or_continue} { set test "mi runto $func" set bp [mi_make_breakpoint -type breakpoint -disp del \ -func $func\(\\\(.*\\\)\)?] - mi_gdb_test "200-break-insert -t $func" "200\\^done,$bp" \ + set extra_opts "" + if {$qualified} { + append extra_opts "--qualified" + } + mi_gdb_test "200-break-insert $extra_opts -t $func" "200\\^done,$bp" \ "breakpoint at $func" if {$run_or_continue == "run"} { @@ -1089,7 +1093,7 @@ proc mi_runto {func} { # Just like runto_main but works with the MI interface. proc mi_runto_main {} { - return [mi_runto_helper "main" "run"] + return [mi_runto_helper "main" "run" 1] } # Next to the next statement -- 2.14.5