to268 updated this revision to Diff 556871. to268 marked an inline comment as done. to268 added a comment.
Added recommendation by @aaron.ballman Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D159522/new/ https://reviews.llvm.org/D159522 Files: clang/docs/ReleaseNotes.rst clang/lib/Sema/SemaOverload.cpp clang/test/Sema/atomic-expr.c Index: clang/test/Sema/atomic-expr.c =================================================================== --- clang/test/Sema/atomic-expr.c +++ clang/test/Sema/atomic-expr.c @@ -216,3 +216,9 @@ struct T { int a; }; (void)(_Atomic struct T)s; // expected-error {{used type 'struct T' where arithmetic or pointer type is required}} } + +// Test if we can handle an _Atomic qualified integer in a switch statement. +void func_19(void) { + _Atomic int a = 0; + switch (a) { } +} Index: clang/lib/Sema/SemaOverload.cpp =================================================================== --- clang/lib/Sema/SemaOverload.cpp +++ clang/lib/Sema/SemaOverload.cpp @@ -6302,10 +6302,12 @@ From = result.get(); } + // Try converting the expression to an Lvalue first, to get rid of qualifiers. + ExprResult Converted = DefaultLvalueConversion(From); + QualType T = Converted.isUsable() ? Converted.get()->getType() : QualType(); // If the expression already has a matching type, we're golden. - QualType T = From->getType(); if (Converter.match(T)) - return DefaultLvalueConversion(From); + return Converted; // FIXME: Check for missing '()' if T is a function type? Index: clang/docs/ReleaseNotes.rst =================================================================== --- clang/docs/ReleaseNotes.rst +++ clang/docs/ReleaseNotes.rst @@ -220,6 +220,8 @@ an invalid conversion during method function overload resolution. - Fix parser crash when dealing with ill-formed objective C++ header code. Fixes (`#64836 <https://github.com/llvm/llvm-project/issues/64836>`_) +- Clang now allows an `_Atomic` qualified integer in a switch statement. Fixes + (`#65557 <https://github.com/llvm/llvm-project/issues/65557>`_) Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Index: clang/test/Sema/atomic-expr.c =================================================================== --- clang/test/Sema/atomic-expr.c +++ clang/test/Sema/atomic-expr.c @@ -216,3 +216,9 @@ struct T { int a; }; (void)(_Atomic struct T)s; // expected-error {{used type 'struct T' where arithmetic or pointer type is required}} } + +// Test if we can handle an _Atomic qualified integer in a switch statement. +void func_19(void) { + _Atomic int a = 0; + switch (a) { } +} Index: clang/lib/Sema/SemaOverload.cpp =================================================================== --- clang/lib/Sema/SemaOverload.cpp +++ clang/lib/Sema/SemaOverload.cpp @@ -6302,10 +6302,12 @@ From = result.get(); } + // Try converting the expression to an Lvalue first, to get rid of qualifiers. + ExprResult Converted = DefaultLvalueConversion(From); + QualType T = Converted.isUsable() ? Converted.get()->getType() : QualType(); // If the expression already has a matching type, we're golden. - QualType T = From->getType(); if (Converter.match(T)) - return DefaultLvalueConversion(From); + return Converted; // FIXME: Check for missing '()' if T is a function type? Index: clang/docs/ReleaseNotes.rst =================================================================== --- clang/docs/ReleaseNotes.rst +++ clang/docs/ReleaseNotes.rst @@ -220,6 +220,8 @@ an invalid conversion during method function overload resolution. - Fix parser crash when dealing with ill-formed objective C++ header code. Fixes (`#64836 <https://github.com/llvm/llvm-project/issues/64836>`_) +- Clang now allows an `_Atomic` qualified integer in a switch statement. Fixes + (`#65557 <https://github.com/llvm/llvm-project/issues/65557>`_) Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits