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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 7F00F3851C33 for ; Mon, 17 Aug 2020 13:24:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7F00F3851C33 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-368-NtH-mY_KN1-Pcy2HqEMlbw-1; Mon, 17 Aug 2020 09:24:28 -0400 X-MC-Unique: NtH-mY_KN1-Pcy2HqEMlbw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 79285102C86F; Mon, 17 Aug 2020 13:24:27 +0000 (UTC) Received: from blade.nx (ovpn-114-47.ams2.redhat.com [10.36.114.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AD5D5D9D2; Mon, 17 Aug 2020 13:24:27 +0000 (UTC) Received: from blade.com (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 575A2816CCA9; Mon, 17 Aug 2020 14:24:26 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH v2] Enable gdb.cp/ambiguous.exp with GCC and clang Date: Mon, 17 Aug 2020 14:24:24 +0100 Message-Id: <1597670664-14171-1-git-send-email-gbenson@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Mon, 17 Aug 2020 13:24:32 -0000 Pedro Alves wrote: > On 7/27/20 2:09 PM, Gary Benson via Gdb-patches wrote: > > Furthermore, gdb.cp/ambiguous.exp has been disabled when using GCC > > since 1998. > > Curious you reference the year, do you know it because you found the > commit that disabled it? Yes :) > > -if { [test_compiler_info gcc-*] } then { continue } > > +# GCCs prior to 10.1 do not support -Wno-inaccessible-base. > > +if { [test_compiler_info {gcc-[0-9]-*}] > > + || [test_compiler_info {gcc-10-0-*}] } { > > Given the first release of GCC 10 is 10.1... Ah, I didn't know that. > ...do we really need the second check? No :) I've removed it. > > + unsupported "compiler does not support -Wno-inaccessible-base" > > How about instead of bailing out, use "-Wno-inaccessible-base" > with GCC >= 10, and use "-w" with older GCCs? Sure. How about this? -- gdb.cp/ambiguous.exp failed to build using clang with the following error: gdb compile failed, /gdbtest/src/gdb/testsuite/gdb.cp/ambiguous.cc:70:36: warning: direct base 'A1' is inaccessible due to ambiguity: class JVA1 -> class KV -> class A1 class JVA1 -> class A1 [-Winaccessible-base] class JVA1 : public KV, public LV, public A1 { ^~~~~~~~~ This commit builds this testcase with -Wno-inaccessible-base when using clang, to avoid this failure. Furthermore, gdb.cp/ambiguous.exp has been disabled when using GCC since 1998. This commit enables this testcase, building with -Wno-inaccessible-base when using GCC >= 10.1, and -w otherwise. gdb/testsuite/ChangeLog: * gdb.cp/ambiguous.exp: Enable test when compiling with GCC. Add additional_flags=-Wno-inaccessible-base when compiling with GCC >= 10.1 or clang. Add additional_flags=-w when compiling with GCC < 10. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.cp/ambiguous.exp | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/gdb.cp/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp index fffe20a..17fb29f 100644 --- a/gdb/testsuite/gdb.cp/ambiguous.exp +++ b/gdb/testsuite/gdb.cp/ambiguous.exp @@ -30,12 +30,20 @@ if { [skip_cplus_tests] } { continue } standard_testfile .cc if [get_compiler_info "c++"] { + unsupported "couldn't find a valid c++ compiler" return -1 } -if { [test_compiler_info gcc-*] } then { continue } +set additional_flags "" +if {[test_compiler_info {gcc-[0-9]-*}]} { + # GCCs prior to 10.1 do not support -Wno-inaccessible-base. + set additional_flags "additional_flags=-w" +} elseif {[test_compiler_info gcc*] || [test_compiler_info clang*]} { + set additional_flags "additional_flags=-Wno-inaccessible-base" +} -if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ + [list debug c++ $additional_flags]]} { return -1 } -- 1.8.3.1