Skip to content
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

[Clang][Test] Update test after #115159 #115172

Merged
merged 1 commit into from
Nov 6, 2024

Conversation

sdkrystian
Copy link
Member

After #111852 was reverted in #115159, two tests now fail because they partially depend on its changes. This patch temporarily fixes the failing cases by updating the expected output to match the actual output. Once #111852 is relanded, this can be reverted.

@llvmbot llvmbot added the clang Clang issues not falling into any other category label Nov 6, 2024
@llvmbot
Copy link
Member

llvmbot commented Nov 6, 2024

@llvm/pr-subscribers-clang

Author: Krystian Stasiowski (sdkrystian)

Changes

After #111852 was reverted in #115159, two tests now fail because they partially depend on its changes. This patch temporarily fixes the failing cases by updating the expected output to match the actual output. Once #111852 is relanded, this can be reverted.


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

1 Files Affected:

  • (modified) clang/test/CXX/temp/temp.decls/temp.spec.partial/temp.spec.partial.member/p2.cpp (+8-3)
diff --git a/clang/test/CXX/temp/temp.decls/temp.spec.partial/temp.spec.partial.member/p2.cpp b/clang/test/CXX/temp/temp.decls/temp.spec.partial/temp.spec.partial.member/p2.cpp
index 7969b7efe597f9..61f8b1c32e2646 100644
--- a/clang/test/CXX/temp/temp.decls/temp.spec.partial/temp.spec.partial.member/p2.cpp
+++ b/clang/test/CXX/temp/temp.decls/temp.spec.partial/temp.spec.partial.member/p2.cpp
@@ -1,5 +1,4 @@
 // RUN: %clang_cc1 -std=c++20 -fsyntax-only -verify %s
-// expected-no-diagnostics
 
 template<typename T>
 struct A {
@@ -70,11 +69,17 @@ constexpr int A<long>::x<U&> = 5;
 static_assert(A<int>::B<int>::y == 3);
 static_assert(A<int>::B<int*>::y == 3);
 static_assert(A<int>::B<int[]>::y == 3);
-static_assert(A<int>::B<int&>::y == 4);
+
+// FIXME: This should pass!
+static_assert(A<int>::B<int&>::y == 4); // expected-error {{static assertion failed due to requirement 'A<int>::B<int &>::y == 4'}}
+                                        // expected-note@-1 {{expression evaluates to '3 == 4'}}
 static_assert(A<int>::x<int> == 3);
 static_assert(A<int>::x<int*> == 3);
 static_assert(A<int>::x<int[]> == 3);
-static_assert(A<int>::x<int&> == 4);
+
+// FIXME: This should pass!
+static_assert(A<int>::x<int&> == 4); // expected-error {{static assertion failed due to requirement 'A<int>::x<int &> == 4'}}
+                                     // expected-note@-1 {{expression evaluates to '3 == 4'}}
 static_assert(A<long>::B<int>::y == 0);
 static_assert(A<long>::B<int*>::y == 1);
 static_assert(A<long>::B<int[]>::y == 2);

Copy link
Contributor

@jplehr jplehr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM to temporarily fix the bots.

@sdkrystian sdkrystian merged commit f548d39 into llvm:main Nov 6, 2024
8 of 9 checks passed
sdkrystian referenced this pull request Nov 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
clang Clang issues not falling into any other category
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants