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.129.124]) by sourceware.org (Postfix) with ESMTPS id E3A153858C2D for ; Mon, 7 Nov 2022 13:52:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E3A153858C2D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667829179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OpPcTczyhs8EaedAlej+c86HFIBYuqmhMRMmSPUy8CU=; b=iQsfnjbuobowADjOyFmMfNdniVHrnuXZPwYttH54BMS63kkdrrj9z2SFDbNcAFkkrc0NEj eeVDLoKnrSmdC+ZtmX2KgcKQdrcnpmxRWG9NI91kfImiIPpl4Fxl2kBWQZXsBUF2GZHUAn 2OmIXh1soetmmi2HAzzCYyJaQpdzWGI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-627-qNz3S9W_Oy6OhGRLhwjeVA-1; Mon, 07 Nov 2022 08:52:57 -0500 X-MC-Unique: qNz3S9W_Oy6OhGRLhwjeVA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3A21E857F8F for ; Mon, 7 Nov 2022 13:52:57 +0000 (UTC) Received: from fedora.redhat.com (ovpn-193-251.brq.redhat.com [10.40.193.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 281AD2024CB7; Mon, 7 Nov 2022 13:52:56 +0000 (UTC) From: Bruno Larsen To: gdb-patches@sourceware.org Cc: Bruno Larsen Subject: [PATCH v2 3/9] gdb/testsuite: account for clang's nested destructor calls on gdb.cp/mb-ctor.exp Date: Mon, 7 Nov 2022 14:45:59 +0100 Message-Id: <20221107134604.596986-4-blarsen@redhat.com> In-Reply-To: <20221107134604.596986-1-blarsen@redhat.com> References: <20221107134604.596986-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.8 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,RCVD_IN_MSPIKE_H2,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: When compiling virtual classes's destructors, two versions are compiled, one with a single parameter (this) and the other with 2 parameters (this and vtt). GCC's compilation makes it so either the version with 1 parameter or the one with 2 parameters is called, depending on whether the destructor is being called by the class itself or by an inherited class. On the test gdb.cp/mb-ctor.exp, this means that the breakpoint set at the destructor will be hit 4 times. Clang, on the other hand, makes the single-parameter version call the 2 parameter version, probably in an attempt to reduce the size of the resulting executable. This means that the gdb.cp/mb-ctor.exp will hit 6 breakpoints before finishing, and is the reason why this test was failing. To make this test stop failing, a compiler check is added and another "continue" instruction is issued to account for this difference. --- gdb/testsuite/gdb.cp/mb-ctor.exp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gdb/testsuite/gdb.cp/mb-ctor.exp b/gdb/testsuite/gdb.cp/mb-ctor.exp index 5a3c0a4a90f..05dbf507e90 100644 --- a/gdb/testsuite/gdb.cp/mb-ctor.exp +++ b/gdb/testsuite/gdb.cp/mb-ctor.exp @@ -25,6 +25,12 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} { return -1 } +if {[test_compiler_info {clang-*-*} c++]} { + set using_clang true +} else { + set using_clang false +} + if ![runto_main] then { perror "couldn't run to breakpoint" return @@ -71,6 +77,13 @@ gdb_continue_to_breakpoint "set breakpoint here, second dynamic time"\ gdb_test "continue" ".*Breakpoint.*~Derived.*" "Run to dynamic destructor v1" +# Clang makes Derived::~Derived(this) call Derived::~Derives(this, vtt) +# whereas gcc puts all the logic necessary on both functions. +if {$using_clang} { + gdb_test "continue" ".*Breakpoint.*~Derived.*"\ + "clang's nested dynamic destructor call" +} + gdb_test "continue" ".*Breakpoint.*~Derived.*" "Run to dynamic destructor v2" gdb_test "continue" \ @@ -81,6 +94,11 @@ gdb_test "continue" \ ".*Breakpoint.*~Derived.*" \ "run to breakpoint 3 v2" +if {$using_clang} { + gdb_test "continue" ".*Breakpoint.*~Derived.*"\ + "clang's nested destructor call" +} + gdb_test "continue" \ ".*exited normally.*" \ "run to exit" -- 2.37.3