diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -226,6 +226,8 @@ an invalid conversion during method function overload resolution. - Fix parser crash when dealing with ill-formed objective C++ header code. Fixes (`#64836 `_) +- Clang now allows an ``_Atomic`` qualified integer in a switch statement. Fixes + (`#65557 `_) Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp --- a/clang/lib/Sema/SemaOverload.cpp +++ b/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? diff --git a/clang/test/Sema/atomic-expr.c b/clang/test/Sema/atomic-expr.c --- a/clang/test/Sema/atomic-expr.c +++ b/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) { } +}