https://github.com/AMP999 updated https://github.com/llvm/llvm-project/pull/81298
>From d59c262b31937fdd2b907ec11d7f08e4a385007c Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Fri, 9 Feb 2024 21:55:03 +0330 Subject: [PATCH 1/8] [clang] Support `__is_trivially_copyable(int()&)==false` IMHO it would be productive to make a similar change for `typeid`, in `ParseCXXTypeid`, in order to improve Clang's error message for https://godbolt.org/z/oKKWxeYra But that might be better done by adding a new DeclaratorContext specifically for TypeidArg, instead of pretending that the argument to `typeid` is a template argument, because I don't know what else that change might affect. Fixes https://github.com/llvm/llvm-project/issues/77585 --- clang/lib/Parse/ParseExprCXX.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index fd262ff31e661a..746a8b2286ac4c 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -3899,7 +3899,9 @@ ExprResult Parser::ParseTypeTrait() { SmallVector<ParsedType, 2> Args; do { // Parse the next type. - TypeResult Ty = ParseTypeName(); + TypeResult Ty = ParseTypeName(nullptr, getLangOpts().CPlusPlus + ? DeclaratorContext::TemplateArg + : DeclaratorContext::TypeName); if (Ty.isInvalid()) { Parens.skipToEnd(); return ExprError(); @@ -3941,7 +3943,7 @@ ExprResult Parser::ParseArrayTypeTrait() { if (T.expectAndConsume()) return ExprError(); - TypeResult Ty = ParseTypeName(); + TypeResult Ty = ParseTypeName(nullptr, DeclaratorContext::TemplateArg); if (Ty.isInvalid()) { SkipUntil(tok::comma, StopAtSemi); SkipUntil(tok::r_paren, StopAtSemi); >From 4c58f4f351a17cf4bf3c9d0ccfa118d0fe3a52de Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Sun, 11 Feb 2024 20:35:04 +0330 Subject: [PATCH 2/8] [clang] Fix the failing test in #81298 --- clang/test/Sema/static-assert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/test/Sema/static-assert.c b/clang/test/Sema/static-assert.c index 4e9e6b7ee558bd..7e1ce135cbd995 100644 --- a/clang/test/Sema/static-assert.c +++ b/clang/test/Sema/static-assert.c @@ -57,7 +57,7 @@ UNION(char[2], short) u2 = { .one = { 'a', 'b' } }; // ext-warning 3 {{'_Static_ typedef UNION(char, short) U3; // expected-error {{static assertion failed due to requirement 'sizeof(char) == sizeof(short)': type size mismatch}} \ // expected-note{{evaluates to '1 == 2'}} \ // ext-warning 3 {{'_Static_assert' is a C11 extension}} -typedef UNION(float, 0.5f) U4; // expected-error {{expected a type}} \ +typedef UNION(float, 0.5f) U4; // expected-error-re {{{{type name requires a specifier or qualifier|expected a type}}}} \ // ext-warning 3 {{'_Static_assert' is a C11 extension}} // After defining the assert macro in MS-compatibility mode, we should >From 03c2cfb73fc291ecfc5318077b295a6e38cd9869 Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Mon, 12 Feb 2024 23:47:33 +0330 Subject: [PATCH 3/8] Add a release note. --- clang/docs/ReleaseNotes.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 32440ee64e3ebe..0beb10af709804 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -217,6 +217,8 @@ Bug Fixes to C++ Support Fixes (`#80971 ICE when explicit object parameter be a function parameter pack`) - Fixed a bug where abbreviated function templates would append their invented template parameters to an empty template parameter lists. +- Fix parsing of abominable function types inside type traits. + Fixes (`#77585 <https://github.com/llvm/llvm-project/issues/77585>`_) Bug Fixes to AST Handling ^^^^^^^^^^^^^^^^^^^^^^^^^ >From 0de0aa09fb5f45fcde688d988377582b9257b6b8 Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Tue, 13 Feb 2024 01:19:27 +0330 Subject: [PATCH 4/8] Remove trailing white space in ReleaseNotes.rst. --- clang/docs/ReleaseNotes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 0beb10af709804..55f3faea365a07 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -217,7 +217,7 @@ Bug Fixes to C++ Support Fixes (`#80971 ICE when explicit object parameter be a function parameter pack`) - Fixed a bug where abbreviated function templates would append their invented template parameters to an empty template parameter lists. -- Fix parsing of abominable function types inside type traits. +- Fix parsing of abominable function types inside type traits. Fixes (`#77585 <https://github.com/llvm/llvm-project/issues/77585>`_) Bug Fixes to AST Handling >From 8c92b1e803b213dbe037e5b38951a05794fd677c Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Tue, 20 Feb 2024 15:19:04 +0330 Subject: [PATCH 5/8] Make C mode and C++ mode tests separated. --- clang/test/Sema/static-assert.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/clang/test/Sema/static-assert.c b/clang/test/Sema/static-assert.c index 7e1ce135cbd995..ae5e8076e0beda 100644 --- a/clang/test/Sema/static-assert.c +++ b/clang/test/Sema/static-assert.c @@ -1,6 +1,6 @@ -// RUN: %clang_cc1 -std=c11 -Wgnu-folding-constant -fsyntax-only -verify %s -// RUN: %clang_cc1 -fms-compatibility -Wgnu-folding-constant -DMS -fsyntax-only -verify=expected,ms %s -// RUN: %clang_cc1 -std=c99 -pedantic -Wgnu-folding-constant -fsyntax-only -verify=expected,ext %s +// RUN: %clang_cc1 -std=c11 -Wgnu-folding-constant -fsyntax-only -verify=expected,c %s +// RUN: %clang_cc1 -fms-compatibility -Wgnu-folding-constant -DMS -fsyntax-only -verify=expected,ms,c %s +// RUN: %clang_cc1 -std=c99 -pedantic -Wgnu-folding-constant -fsyntax-only -verify=expected,ext,c %s // RUN: %clang_cc1 -xc++ -std=c++11 -pedantic -fsyntax-only -verify=expected,ext,cxx %s _Static_assert("foo", "string is nonzero"); // ext-warning {{'_Static_assert' is a C11 extension}} @@ -57,7 +57,8 @@ UNION(char[2], short) u2 = { .one = { 'a', 'b' } }; // ext-warning 3 {{'_Static_ typedef UNION(char, short) U3; // expected-error {{static assertion failed due to requirement 'sizeof(char) == sizeof(short)': type size mismatch}} \ // expected-note{{evaluates to '1 == 2'}} \ // ext-warning 3 {{'_Static_assert' is a C11 extension}} -typedef UNION(float, 0.5f) U4; // expected-error-re {{{{type name requires a specifier or qualifier|expected a type}}}} \ +typedef UNION(float, 0.5f) U4; // c-error {{expected a type}} \ + // cxx-error {{type name requires a specifier or qualifier}} \ // ext-warning 3 {{'_Static_assert' is a C11 extension}} // After defining the assert macro in MS-compatibility mode, we should >From eb4aaad30fcae96c1a167705755c6dce57f662c4 Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Mon, 4 Mar 2024 16:17:26 +0330 Subject: [PATCH 6/8] [Clang]Add new test cases to `clang/test/SemaCXX/type-traits-nonobject.cpp` --- clang/test/SemaCXX/type-traits-nonobject.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clang/test/SemaCXX/type-traits-nonobject.cpp b/clang/test/SemaCXX/type-traits-nonobject.cpp index c9e3c30e5533d4..52661c303215f4 100644 --- a/clang/test/SemaCXX/type-traits-nonobject.cpp +++ b/clang/test/SemaCXX/type-traits-nonobject.cpp @@ -6,11 +6,14 @@ static_assert(!__is_pod(void), ""); static_assert(!__is_pod(int&), ""); static_assert(!__is_pod(int()), ""); +static_assert(!__is_pod(int()&), ""); static_assert(!__is_trivially_copyable(void), ""); static_assert(!__is_trivially_copyable(int&), ""); static_assert(!__is_trivially_copyable(int()), ""); +static_assert(!__is_trivially_copyable(int()&), ""); static_assert(!__is_trivially_relocatable(void), ""); static_assert(!__is_trivially_relocatable(int&), ""); static_assert(!__is_trivially_relocatable(int()), ""); +static_assert(!__is_trivially_relocatable(int()&), ""); \ No newline at end of file >From 28258fc21dca1d30bb8758f6fb460e79367785b8 Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Mon, 4 Mar 2024 20:16:11 +0330 Subject: [PATCH 7/8] Update type-traits-nonobject.cpp --- clang/test/SemaCXX/type-traits-nonobject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/test/SemaCXX/type-traits-nonobject.cpp b/clang/test/SemaCXX/type-traits-nonobject.cpp index 52661c303215f4..5f7c20cc2e11c3 100644 --- a/clang/test/SemaCXX/type-traits-nonobject.cpp +++ b/clang/test/SemaCXX/type-traits-nonobject.cpp @@ -16,4 +16,4 @@ static_assert(!__is_trivially_copyable(int()&), ""); static_assert(!__is_trivially_relocatable(void), ""); static_assert(!__is_trivially_relocatable(int&), ""); static_assert(!__is_trivially_relocatable(int()), ""); -static_assert(!__is_trivially_relocatable(int()&), ""); \ No newline at end of file +static_assert(!__is_trivially_relocatable(int()&), ""); >From 832b817cc327cdd36b3295955bd6f40a2a29252d Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Mon, 4 Mar 2024 23:44:18 +0330 Subject: [PATCH 8/8] Revise the style of code in `ParseExprCXX.cpp` --- clang/lib/Parse/ParseExprCXX.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index fab239cb6ef9b4..9471f6f725efb1 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -3908,9 +3908,10 @@ ExprResult Parser::ParseTypeTrait() { SmallVector<ParsedType, 2> Args; do { // Parse the next type. - TypeResult Ty = ParseTypeName(nullptr, getLangOpts().CPlusPlus - ? DeclaratorContext::TemplateArg - : DeclaratorContext::TypeName); + TypeResult Ty = + ParseTypeName(/*SourceRange=*/nullptr, + getLangOpts().CPlusPlus ? DeclaratorContext::TemplateArg + : DeclaratorContext::TypeName); if (Ty.isInvalid()) { Parens.skipToEnd(); return ExprError(); @@ -3952,7 +3953,8 @@ ExprResult Parser::ParseArrayTypeTrait() { if (T.expectAndConsume()) return ExprError(); - TypeResult Ty = ParseTypeName(nullptr, DeclaratorContext::TemplateArg); + TypeResult Ty = + ParseTypeName(/*SourceRange=*/nullptr, DeclaratorContext::TemplateArg); if (Ty.isInvalid()) { SkipUntil(tok::comma, StopAtSemi); SkipUntil(tok::r_paren, StopAtSemi); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
