From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id +4slMohE+GBDOAAAWB0awg (envelope-from ) for ; Wed, 21 Jul 2021 12:00:08 -0400 Received: by simark.ca (Postfix, from userid 112) id BD95C1EDFB; Wed, 21 Jul 2021 12:00:08 -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.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED 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 56E9A1EDF5 for ; Wed, 21 Jul 2021 12:00:06 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AF8A1386480A for ; Wed, 21 Jul 2021 16:00:05 +0000 (GMT) Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 918FD3858003 for ; Wed, 21 Jul 2021 15:59:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 918FD3858003 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x32c.google.com with SMTP id g12so1634640wme.2 for ; Wed, 21 Jul 2021 08:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=c/F99A/c9ZA4KOqE8+IYGpeEeV09FvC6xGk4ZtnWM2A=; b=hM58uNWI1oD+lHJM+9shsHvdDxt5HtjOFXXkD4X6o1cayfi4myZ+HyqYucd/GmzFPA wXKOtHT7Qt6YuKK5SKEVcJdk+WRQn/Q3XCpzpQid28rdgFXCUaKq/UIKB/JU+A+3ipAM QFwv/hFQFRk7OOr8ZevvZuMyMzKbUupTYjScvBJcUZRTCUPzvvy16VeDl+vJX/DAJzoz dl13e5+x3H9XHV2WcmyJbFf9+0nsmyd25nqlqirbA0Szf3WJzrq8fO/1E267XiByefrr Jp4ePSO87GrpNVvmv+Tm8Q/gyt8/m08Ax+XSx5HcIyq5GzrGCC5c1XXvhHoiktxv45xG v+9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=c/F99A/c9ZA4KOqE8+IYGpeEeV09FvC6xGk4ZtnWM2A=; b=Vg64KNzWFNhbWIQJO/TsScK9bpqg+HTEh474SHhqwdWBDPZxRs7+xHU4LbLQKWxjG9 FhtmCVYkFw0Dw+YwWZpo0UTFBGlOZantqx4kK5EsmZyL737pfWDkscMKLsljDBnCEK63 wzo+eL2jEwfl4/I4Z+VqL+VzVHaVcRb/2TYeRHLMWCZL9yxO0PFSfWMKKA2DVqkGrwOC lvNVcWGAmTaW24rzgGfumEl1cJEPvlVgABtK22VmiRpzf+Vhn8c4utXG4DRrGPudECc/ qh1pYgXAVa0WLdzYPY47kIBcww0qJmxTchDrzUlFtgWPxCi6N6S6eU2yoaDwzzmkQkDw bSaA== X-Gm-Message-State: AOAM531PPE4Lk+9P0U/KeVbYbHy5yWW758noR2qtoKAyF2pt82bcvVJa qv5A+zmFMm7UWinJPXK4voZeNw== X-Google-Smtp-Source: ABdhPJwUu35v1IVyxfjLF1yYdS+avGm38XokD2H3TNJv0tZ8b/A/51sXDQiFrKrQPvBDUfLzxP/yrg== X-Received: by 2002:a7b:c4d9:: with SMTP id g25mr4668687wmk.108.1626883193601; Wed, 21 Jul 2021 08:59:53 -0700 (PDT) Received: from localhost (host86-134-238-200.range86-134.btcentralplus.com. [86.134.238.200]) by smtp.gmail.com with ESMTPSA id z16sm28491124wrl.8.2021.07.21.08.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 08:59:53 -0700 (PDT) Date: Wed, 21 Jul 2021 16:59:52 +0100 From: Andrew Burgess To: Tom de Vries Subject: Re: [PATCH][gdb/testsuite] Fix gdb.cp/step-and-next-inline.exp with gcc-11 Message-ID: <20210721155952.GC2253869@embecosm.com> References: <20210721083134.GA7560@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210721083134.GA7560@delia.home> X-Operating-System: Linux/5.8.18-100.fc31.x86_64 (x86_64) X-Uptime: 16:59:28 up 5 days, 2:33, X-Editor: GNU Emacs [ http://www.gnu.org/software/emacs ] 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: , Cc: gdb-patches@sourceware.org Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" * Tom de Vries [2021-07-21 10:31:36 +0200]: > Hi, > > When running test-case gdb.cp/step-and-next-inline.exp with gcc-11, I run > into: > ... > KPASS: gdb.cp/step-and-next-inline.exp: no_header: next step 1 \ > (PRMS symtab/25507) > FAIL: gdb.cp/step-and-next-inline.exp: no_header: next step 2 > KPASS: gdb.cp/step-and-next-inline.exp: no_header: next step 3 \ > (PRMS symtab/25507) > ... > > [ Note that I get the same result with gcc-11 and target board > unix/gdb:debug_flags=-gdwarf-4, so this is not a dwarf 4 vs 5 issue. ] > > With gcc-10, I have this trace: > ... > 64 get_alias_set (&xx); > get_alias_set (t=0x601038 ) at step-and-next-inline.cc:51 > 51 if (t != NULL > 40 if (t->x != i) > 52 && TREE_TYPE (t).z != 1 > 43 return x; > 53 && TREE_TYPE (t).z != 2 > 43 return x; > 54 && TREE_TYPE (t).z != 3) > 43 return x; > main () at step-and-next-inline.cc:65 > 65 return 0; > ... > and with gcc-11, I have instead: > ... > 64 get_alias_set (&xx); > get_alias_set (t=0x601038 ) at step-and-next-inline.cc:51 > 51 if (t != NULL > 52 && TREE_TYPE (t).z != 1 > 43 return x; > 53 && TREE_TYPE (t).z != 2 > 43 return x; > 54 && TREE_TYPE (t).z != 3) > 43 return x; > main () at step-and-next-inline.cc:65 > 65 return 0; > ... > and with clang-10, I have instead: > ... > 64 get_alias_set (&xx); > get_alias_set (t=0x601034 ) at step-and-next-inline.cc:51 > 51 if (t != NULL > 52 && TREE_TYPE (t).z != 1 > 53 && TREE_TYPE (t).z != 2 > 54 && TREE_TYPE (t).z != 3) > 51 if (t != NULL > 57 } > main () at step-and-next-inline.cc:65 > 65 return 0; > ... > > The test-case tries to verify that we don't step into inlined function > tree_check (lines 40-43) (so, with the clang trace we get that right). > > The test-case then tries to kfail the problems when using gcc, but this is > done in such a way that the testing still gets out of sync after a failure. > That is: the "next step 2" check that is supposed to match > "TREE_TYPE (t).z != 2" is actually matching "TREE_TYPE (t).z != 1": > ... > (gdb) next^M > 52 && TREE_TYPE (t).z != 1^M > (gdb) PASS: gdb.cp/step-and-next-inline.exp: no_header: next step 2 > ... > > Fix this by issuing extra nexts to arrive at the required lines. > > Tested on x86_64-linux, with gcc-8, gcc-9, gcc-10, gcc-11, clang-8, clang-10 > and clang-12. > > Any comments? LGTM. Thanks, Andrew > > Thanks, > - Tom > > [gdb/testsuite] Fix gdb.cp/step-and-next-inline.exp with gcc-11 > > gdb/testsuite/ChangeLog: > > 2021-07-20 Tom de Vries > > * gdb.cp/step-and-next-inline.cc (tree_check, get_alias_set, main): > Tag closing brace with comment. > * gdb.cp/step-and-next-inline.h: Update to keep identical with > step-and-next-inline.cc. > * gdb.cp/step-and-next-inline.exp: Issue extra next when required. > > --- > gdb/testsuite/gdb.cp/step-and-next-inline.cc | 6 +- > gdb/testsuite/gdb.cp/step-and-next-inline.exp | 89 ++++++++++++++++++++++++--- > gdb/testsuite/gdb.cp/step-and-next-inline.h | 2 +- > 3 files changed, 84 insertions(+), 13 deletions(-) > > diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.cc b/gdb/testsuite/gdb.cp/step-and-next-inline.cc > index 6f0a7fbda9e..26b29d01777 100644 > --- a/gdb/testsuite/gdb.cp/step-and-next-inline.cc > +++ b/gdb/testsuite/gdb.cp/step-and-next-inline.cc > @@ -41,7 +41,7 @@ tree_check (tree *t, int i) > abort(); > tree *x = t; > return x; > -} > +} // tree-check > > #endif /* USE_NEXT_INLINE_H */ > > @@ -54,7 +54,7 @@ get_alias_set (tree *t) > && TREE_TYPE (t).z != 3) > return 0; > return 1; > -} > +} // get_alias_set > > tree xx; > > @@ -63,4 +63,4 @@ main() > { > get_alias_set (&xx); > return 0; > -} > +} // main > diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.exp b/gdb/testsuite/gdb.cp/step-and-next-inline.exp > index 85f7b8d5af1..13d801bb539 100644 > --- a/gdb/testsuite/gdb.cp/step-and-next-inline.exp > +++ b/gdb/testsuite/gdb.cp/step-and-next-inline.exp > @@ -67,29 +67,100 @@ proc do_test { use_header } { > gdb_test "step" ".*" "step into get_alias_set" > gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \ > "not in inline 1" > + > # It's possible that this first failure (when not using a header > # file) is GCC's fault, though the remaining failures would best > # be fixed by adding location views support (though it could be > # that some easier heuristic could be figured out). Still, it is > # not certain that the first failure wouldn't also be fixed by > # having location view support, so for now it is tagged as such. > - if {[test_compiler_info gcc*] && !$use_header} { > - setup_kfail "*-*-*" symtab/25507 > + set have_kfail [expr [test_compiler_info gcc*] && !$use_header] > + > + set ok 1 > + gdb_test_multiple "next" "next step 1" { > + -re -wrap "if \\(t->x != i\\)" { > + set ok 0 > + send_gdb "next\n" > + exp_continue > + } > + -re -wrap ".*TREE_TYPE.* != 1" { > + if { $ok } { > + pass $gdb_test_name > + } else { > + if { $have_kfail } { > + setup_kfail "*-*-*" symtab/25507 > + } > + fail $gdb_test_name > + } > + } > } > - gdb_test "next" ".*TREE_TYPE.*" "next step 1" > gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \ > "not in inline 2" > - gdb_test "next" ".*TREE_TYPE.*" "next step 2" > + > + set ok 1 > + gdb_test_multiple "next" "next step 2" { > + -re -wrap "return x;" { > + set ok 0 > + send_gdb "next\n" > + exp_continue > + } > + -re -wrap ".*TREE_TYPE.* != 2" { > + if { $ok } { > + pass $gdb_test_name > + } else { > + if { $have_kfail } { > + setup_kfail "*-*-*" symtab/25507 > + } > + fail $gdb_test_name > + } > + } > + } > gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \ > "not in inline 3" > - if {[test_compiler_info gcc*] && !$use_header} { > - setup_kfail "*-*-*" symtab/25507 > + > + set ok 1 > + gdb_test_multiple "next" "next step 3" { > + -re -wrap "return x;" { > + set ok 0 > + send_gdb "next\n" > + exp_continue > + } > + -re -wrap ".*TREE_TYPE.* != 3\\)" { > + if { $ok } { > + pass $gdb_test_name > + } else { > + if { $have_kfail } { > + setup_kfail "*-*-*" symtab/25507 > + } > + fail $gdb_test_name > + } > + } > } > - gdb_test "next" ".*TREE_TYPE.*" "next step 3" > gdb_test "bt" "\\s*\\#0\\s+get_alias_set\[^\r\]*${srcfile}:.*" \ > "not in inline 4" > - if {!$use_header} { setup_kfail "*-*-*" symtab/25507 } > - gdb_test "next" "return 0.*" "next step 4" > + > + set ok 1 > + gdb_test_multiple "next" "next step 4" { > + -re -wrap "(if \\(t != NULL|\} // get_alias_set)" { > + send_gdb "next\n" > + exp_continue > + } > + -re -wrap "return x;" { > + set ok 0 > + send_gdb "next\n" > + exp_continue > + } > + -re -wrap "return 0.*" { > + if { $ok } { > + pass $gdb_test_name > + } else { > + if { $have_kfail } { > + setup_kfail "*-*-*" symtab/25507 > + } > + fail $gdb_test_name > + } > + } > + } > gdb_test "bt" \ > "\\s*\\#0\\s+(main|get_alias_set)\[^\r\]*${srcfile}:.*" \ > "not in inline 5" > diff --git a/gdb/testsuite/gdb.cp/step-and-next-inline.h b/gdb/testsuite/gdb.cp/step-and-next-inline.h > index 8eb4b71d3cc..bf45d8a388c 100644 > --- a/gdb/testsuite/gdb.cp/step-and-next-inline.h > +++ b/gdb/testsuite/gdb.cp/step-and-next-inline.h > @@ -35,4 +35,4 @@ tree_check (tree *t, int i) > abort(); > tree *x = t; > return x; > -} > +} // tree_check