Skip to content

release/21.x: [libc++] Fix tests after #144220 #152105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release/21.x
Choose a base branch
from

Conversation

cor3ntin
Copy link
Contributor

@cor3ntin cor3ntin commented Aug 5, 2025

This is a backport of the test fixes made in #151935

Fixes #150601

This is a backport of the test fixes made in llvm#151935

Fixes llvm#150601
@cor3ntin cor3ntin added this to the LLVM 21.x Release milestone Aug 5, 2025
@cor3ntin cor3ntin requested a review from a team as a code owner August 5, 2025 08:59
@github-project-automation github-project-automation bot moved this to Needs Triage in LLVM Release Status Aug 5, 2025
@llvmbot llvmbot added the libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. label Aug 5, 2025
@llvmbot
Copy link
Member

llvmbot commented Aug 5, 2025

@llvm/pr-subscribers-libcxx

Author: Corentin Jabot (cor3ntin)

Changes

This is a backport of the test fixes made in #151935

Fixes #150601


Full diff: https://github.com/llvm/llvm-project/pull/152105.diff

1 Files Affected:

  • (modified) libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp (+3-2)
diff --git a/libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp
index 91a7db1d9a7c6..1a2d080d10c3c 100644
--- a/libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp
+++ b/libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp
@@ -124,8 +124,9 @@ void test() {
 #if _LIBCPP_HAS_EXCEPTIONS
   // expected-error-re@*:* {{call to deleted constructor of{{.*}}}}
   // expected-error-re@*:* {{call to deleted constructor of{{.*}}}}
-  // expected-error-re@*:* 1-2{{call to deleted constructor of{{.*}}}}
-  // expected-error-re@*:* 0-2{{call to deleted constructor of{{.*}}}}
 #endif
+// These diagnostics can also additionally be produced by static_assert (see GH150601).
+// expected-error-re@*:* 0-2{{call to deleted constructor of{{.*}}}}
+// expected-error-re@*:* 0-2{{call to deleted constructor of{{.*}}}}
 }
 // clang-format on

@tru
Copy link
Collaborator

tru commented Aug 5, 2025

@ldionne can you review?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. release:backport
Projects
Status: Needs Triage
Development

Successfully merging this pull request may close these issues.

3 participants