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.133.124]) by sourceware.org (Postfix) with ESMTPS id 7EFEC3858C56 for ; Tue, 26 Mar 2024 11:44:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7EFEC3858C56 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7EFEC3858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711453464; cv=none; b=jC6ZuzVOu5x0cR2KExfbWlhO3xqKIrlNO2yjpGQNrgT8sR7jF4U4tI6oGumnxiVshNJjhfRTNSIrb08E24MDkzwcAgsWK5IMuR1QadOYdgAh23794s+yTeEM4oKKv4ckHBh33sFUPGXk2XaaShYU1fZ1hqkQHb8t8jIgEh1Bgmc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711453464; c=relaxed/simple; bh=wPcaJsQ9bWHJv2YJ19NU83bKG9fISt/pOttm7PTiWq4=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=GVo+AD1qidXDra8iIB7ARFOGpmZyMJvA5bU43cFrTI/Cqd1qnhahprMpXqyGhPFswLl4BKw+qToncNCaC42bOqYBiiHey8vu+3diZCOtLLFCRHDlqBXQVpQVD7FMQV7ibXsnzF4EwgzOoMdx5o68s9aGSXtMaotQ/PZ/rvUgW7o= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711453460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=uba45GOcNwYwfE2DZHFtvgcqTDvNTxaMj4sGbPh3BOI=; b=fzAHTLcNLUbcx2mJ9SCCoCRKyPtd4IyqY1ca5WLGJ1Dhl32L418iN2gtsxjZItN+IGAipA jngdmCS0KMNTL7GvKuPV5MEOiwajsmwB8wWsF+t85sWXWc5M9b9XWDYfR23B0tnlADSlWi AByE21agZoSI9olAEF/EDPMgBxaIdZI= Received: from mail-yb1-f198.google.com (mail-yb1-f198.google.com [209.85.219.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-76-9wjbbByaPDGcA4j-aQ6spw-1; Tue, 26 Mar 2024 07:44:19 -0400 X-MC-Unique: 9wjbbByaPDGcA4j-aQ6spw-1 Received: by mail-yb1-f198.google.com with SMTP id 3f1490d57ef6-dbf216080f5so9097979276.1 for ; Tue, 26 Mar 2024 04:44:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711453458; x=1712058258; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uba45GOcNwYwfE2DZHFtvgcqTDvNTxaMj4sGbPh3BOI=; b=D/qce/aNn2TAq53+5/Tkvivw8ZtdOBbJcUKpiUmXjZIDMi1nhTWK8qtURT3ZwpRFhA lqy6Q5M++ALvBoXbEekNuSgRxVfEDzqkvwLcu9AdKkpoo/4At2TqbPwpmVxNXBNIE7uy GUEOE3x8zmPwJWROSSosXdaaO0jgSLAcIGd2N/ds4PspgvKSJaZ8ud0T06RDYErDUGB1 HMRhgpX1SSjn7X+Ss3WoUYTUZpgdNIss9/3FY4IMr193mpnJdznlSjkYju/dvNtFHJCY Ss+6I30KVNosNKqfLO6sAun7Mw+PypvoHxXipWfc+K8EEnRcbSJSIsPtAuoqaf8WvdnO 0Ytg== X-Forwarded-Encrypted: i=1; AJvYcCV3GON24JQ9IZkcqWs43aTo1D+otth5FuhXdwL5VUkdKGqbC2qOWgFDfL34yE1N2vUGnfIqivbipHDgFJril7DE1Smg86o= X-Gm-Message-State: AOJu0Yx8oq5vuxbolf9HBj7mQPxuz+LnNGr7c/eNGx5wrHCHQklxOa86 ltaCJh0Ia4gOp/TeWJTddBbXSNycQljIrmAcxDQtlIk7kx/BAAM30RKgPlsGFc+rh0CvaBsfECb PQ0k+LOZIGo1GQNDy/z/7OAVWZ1Cp7hqDuZyw59iDRPkgRAeH66pnXfkJZSfu3r1KAS91Zd+qr9 aTfgLK/bIQTssvsZ94eE1WnMqTyRU= X-Received: by 2002:a5b:151:0:b0:dc2:6f92:2ec0 with SMTP id c17-20020a5b0151000000b00dc26f922ec0mr6840546ybp.51.1711453457416; Tue, 26 Mar 2024 04:44:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUd/9NOkaRHYajNPEzEomBVnRSWnjXgMVB6aP/EgPzZ0E+Zj0HP+0W9BIz27o2dojJKLhxDjxf3F9O2BhEbhM= X-Received: by 2002:a5b:151:0:b0:dc2:6f92:2ec0 with SMTP id c17-20020a5b0151000000b00dc26f922ec0mr6840529ybp.51.1711453457026; Tue, 26 Mar 2024 04:44:17 -0700 (PDT) MIME-Version: 1.0 References: <20240323001908.384974-1-jwakely@redhat.com> <20240323001908.384974-2-jwakely@redhat.com> In-Reply-To: <20240323001908.384974-2-jwakely@redhat.com> From: Jonathan Wakely Date: Tue, 26 Mar 2024 11:44:00 +0000 Message-ID: Subject: Re: [PATCH 2/2] libstdc++: Replace stacktrace effective target with feature test To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-11.6 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_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,URIBL_BLACK 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: Pushed to trunk. On Sat, 23 Mar 2024 at 00:22, Jonathan Wakely wrote: > > And this replaces an existing custom dg-require- directive with a use of > the new one that checks for a standard feature test macro. I didn't see > any other existing dg-require-xxx directives that can be replaced like > this. > > -- >8 -- > > Remove the dejagnu code for checking whether std::stacktrace is supported > and just use the new dg-require-cpp-feature-test directive to check for > __cpp_lib_stacktrace instead. > > libstdc++-v3/ChangeLog: > > * testsuite/19_diagnostics/stacktrace/current.cc: Check for > __cpp_lib_stacktrace instead of check for stacktrace ET. > * testsuite/19_diagnostics/stacktrace/entry.cc: Likewise. > * testsuite/19_diagnostics/stacktrace/hash.cc: Likewise. > * testsuite/19_diagnostics/stacktrace/output.cc: Likewise. > * testsuite/19_diagnostics/stacktrace/stacktrace.cc: Likewise. > * testsuite/19_diagnostics/stacktrace/synopsis.cc: Likewise. > * testsuite/19_diagnostics/stacktrace/version.cc: Likewise. > * testsuite/23_containers/vector/debug/assign4_backtrace_neg.cc: > Likewise. > * testsuite/lib/libstdc++.exp (check_effective_target_stacktrace): > Remove. > --- > .../testsuite/19_diagnostics/stacktrace/current.cc | 2 +- > libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc | 2 +- > libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc | 2 +- > .../testsuite/19_diagnostics/stacktrace/output.cc | 2 +- > .../testsuite/19_diagnostics/stacktrace/stacktrace.cc | 2 +- > .../testsuite/19_diagnostics/stacktrace/synopsis.cc | 2 +- > .../testsuite/19_diagnostics/stacktrace/version.cc | 2 +- > .../23_containers/vector/debug/assign4_backtrace_neg.cc | 2 +- > libstdc++-v3/testsuite/lib/libstdc++.exp | 8 -------- > 9 files changed, 8 insertions(+), 16 deletions(-) > > diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc > index a27836d27af..b1af5f74fb2 100644 > --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc > +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/current.cc > @@ -1,6 +1,6 @@ > // { dg-options "-lstdc++exp" } > // { dg-do run { target c++23 } } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > > #include > #include > diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc > index ab016d56400..bb348ebef8f 100644 > --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc > +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/entry.cc > @@ -1,6 +1,6 @@ > // { dg-options "-lstdc++exp" } > // { dg-do run { target c++23 } } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > > #include > #include "testsuite_hooks.h" > diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc > index 21705098ff0..2176596ae5c 100644 > --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc > +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/hash.cc > @@ -1,6 +1,6 @@ > // { dg-options "-lstdc++exp" } > // { dg-do run { target c++23 } } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > > #include > #include > diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc > index 67f1e0cebaf..e27aea1f508 100644 > --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc > +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/output.cc > @@ -1,6 +1,6 @@ > // { dg-options "-lstdc++exp" } > // { dg-do run { target c++23 } } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > // { dg-add-options no_pch } > > #include > diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc > index 5dfa76951df..070c4157471 100644 > --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc > +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/stacktrace.cc > @@ -1,6 +1,6 @@ > // { dg-options "-lstdc++exp" } > // { dg-do run { target c++23 } } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > > #include > #include "testsuite_allocator.h" > diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc > index 9e775b86ac9..b99d382ec26 100644 > --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc > +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/synopsis.cc > @@ -1,5 +1,5 @@ > // { dg-do compile { target c++23 } } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > // { dg-require-normal-namespace "" } > // { dg-add-options no_pch } > > diff --git a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc > index 21c2d48b7b5..1fc7722a6f4 100644 > --- a/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc > +++ b/libstdc++-v3/testsuite/19_diagnostics/stacktrace/version.cc > @@ -1,5 +1,5 @@ > // { dg-do preprocess { target c++23 } } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > // { dg-add-options no_pch } > > #include > diff --git a/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_backtrace_neg.cc b/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_backtrace_neg.cc > index 43a82fb1201..2f7238c590c 100644 > --- a/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_backtrace_neg.cc > +++ b/libstdc++-v3/testsuite/23_containers/vector/debug/assign4_backtrace_neg.cc > @@ -1,6 +1,6 @@ > // { dg-do run { xfail *-*-* } } > // { dg-options "-D_GLIBCXX_DEBUG_BACKTRACE -lstdc++exp" } > -// { dg-require-effective-target stacktrace } > +// { dg-require-cpp-feature-test __cpp_lib_stacktrace } > > #include > #include > diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp > index 2b31c950826..67a63f5b5f3 100644 > --- a/libstdc++-v3/testsuite/lib/libstdc++.exp > +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp > @@ -1570,14 +1570,6 @@ proc check_effective_target_std_allocator_new { } { > }] > } > > -# Return 1 if libstdc++ was built as --enable-libstdcxx-backtrace > -proc check_effective_target_stacktrace { } { > - return [check_v3_target_prop_cached et_stacktrace { > - set cond "_GLIBCXX_HAVE_STACKTRACE && _GLIBCXX_HOSTED" > - return [v3_check_preprocessor_condition stacktrace $cond] > - }] > -} > - > # Return 1 if RTTI is enabled by the current test flags. > proc check_effective_target_rtti { } { > return [check_v3_target_prop_cached et_rtti { > -- > 2.44.0 >