https://github.com/AMP999 updated https://github.com/llvm/llvm-project/pull/77092
>From ed94371b8e2293642731b72948883c2ec20bd09d Mon Sep 17 00:00:00 2001 From: Amirreza Ashouri <ar.ashouri...@gmail.com> Date: Wed, 3 Jan 2024 23:23:14 +0330 Subject: [PATCH] [clang] Fix behavior of __is_trivially_relocatable(volatile int) Consistent with `__is_trivially_copyable(volatile int) == true` and `__is_trivially_relocatable(volatile Trivial) == true`, `__is_trivially_relocatable(volatile int)` should also be `true`. Fixes https://github.com/llvm/llvm-project/issues/77091 [clang] [test] New tests for __is_trivially_relocatable(cv-qualified type) --- clang/docs/ReleaseNotes.rst | 5 +++++ clang/lib/AST/Type.cpp | 2 ++ clang/test/SemaCXX/type-traits.cpp | 31 ++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 402a2f8687386c..d1e0fec9862d8f 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -175,6 +175,11 @@ Bug Fixes in This Version - Clang now doesn't produce false-positive warning `-Wconstant-logical-operand` for logical operators in C23. Fixes (`#64356 <https://github.com/llvm/llvm-project/issues/64356>`_). +- ``__is_trivially_relocatable`` no longer returns ``true`` for non-object types + such as references and functions, and no longer returns ``false`` for volatile-qualified types. + Fixes (`#67498 <https://github.com/llvm/llvm-project/issues/67498>`_) and + (`#77091 <https://github.com/llvm/llvm-project/issues/77091>`_) + Bug Fixes to Compiler Builtins ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp index 78dcd3f4007a5a..22666184c56ccf 100644 --- a/clang/lib/AST/Type.cpp +++ b/clang/lib/AST/Type.cpp @@ -2682,6 +2682,8 @@ bool QualType::isTriviallyRelocatableType(const ASTContext &Context) const { return false; } else if (const auto *RD = BaseElementType->getAsRecordDecl()) { return RD->canPassInRegisters(); + } else if (BaseElementType.isTriviallyCopyableType(Context)) { + return true; } else { switch (isNonTrivialToPrimitiveDestructiveMove()) { case PCK_Trivial: diff --git a/clang/test/SemaCXX/type-traits.cpp b/clang/test/SemaCXX/type-traits.cpp index 5659594577111e..d4f26adfc04147 100644 --- a/clang/test/SemaCXX/type-traits.cpp +++ b/clang/test/SemaCXX/type-traits.cpp @@ -3104,6 +3104,8 @@ namespace is_trivially_relocatable { static_assert(!__is_trivially_relocatable(void), ""); static_assert(__is_trivially_relocatable(int), ""); static_assert(__is_trivially_relocatable(int[]), ""); +static_assert(__is_trivially_relocatable(const int), ""); +static_assert(__is_trivially_relocatable(volatile int), ""); enum Enum {}; static_assert(__is_trivially_relocatable(Enum), ""); @@ -3115,7 +3117,28 @@ static_assert(__is_trivially_relocatable(Union[]), ""); struct Trivial {}; static_assert(__is_trivially_relocatable(Trivial), ""); +static_assert(__is_trivially_relocatable(const Trivial), ""); +static_assert(__is_trivially_relocatable(volatile Trivial), ""); + static_assert(__is_trivially_relocatable(Trivial[]), ""); +static_assert(__is_trivially_relocatable(const Trivial[]), ""); +static_assert(__is_trivially_relocatable(volatile Trivial[]), ""); + +static_assert(__is_trivially_relocatable(int[10]), ""); +static_assert(__is_trivially_relocatable(const int[10]), ""); +static_assert(__is_trivially_relocatable(volatile int[10]), ""); + +static_assert(__is_trivially_relocatable(int[10][10]), ""); +static_assert(__is_trivially_relocatable(const int[10][10]), ""); +static_assert(__is_trivially_relocatable(volatile int[10][10]), ""); + +static_assert(__is_trivially_relocatable(int[]), ""); +static_assert(__is_trivially_relocatable(const int[]), ""); +static_assert(__is_trivially_relocatable(volatile int[]), ""); + +static_assert(__is_trivially_relocatable(int[][10]), ""); +static_assert(__is_trivially_relocatable(const int[][10]), ""); +static_assert(__is_trivially_relocatable(volatile int[][10]), ""); struct Incomplete; // expected-note {{forward declaration of 'is_trivially_relocatable::Incomplete'}} bool unused = __is_trivially_relocatable(Incomplete); // expected-error {{incomplete type}} @@ -3125,6 +3148,8 @@ struct NontrivialDtor { }; static_assert(!__is_trivially_relocatable(NontrivialDtor), ""); static_assert(!__is_trivially_relocatable(NontrivialDtor[]), ""); +static_assert(!__is_trivially_relocatable(const NontrivialDtor), ""); +static_assert(!__is_trivially_relocatable(volatile NontrivialDtor), ""); struct NontrivialCopyCtor { NontrivialCopyCtor(const NontrivialCopyCtor&) {} @@ -3143,12 +3168,16 @@ struct [[clang::trivial_abi]] TrivialAbiNontrivialDtor { }; static_assert(__is_trivially_relocatable(TrivialAbiNontrivialDtor), ""); static_assert(__is_trivially_relocatable(TrivialAbiNontrivialDtor[]), ""); +static_assert(__is_trivially_relocatable(const TrivialAbiNontrivialDtor), ""); +static_assert(__is_trivially_relocatable(volatile TrivialAbiNontrivialDtor), ""); struct [[clang::trivial_abi]] TrivialAbiNontrivialCopyCtor { TrivialAbiNontrivialCopyCtor(const TrivialAbiNontrivialCopyCtor&) {} }; static_assert(__is_trivially_relocatable(TrivialAbiNontrivialCopyCtor), ""); static_assert(__is_trivially_relocatable(TrivialAbiNontrivialCopyCtor[]), ""); +static_assert(__is_trivially_relocatable(const TrivialAbiNontrivialCopyCtor), ""); +static_assert(__is_trivially_relocatable(volatile TrivialAbiNontrivialCopyCtor), ""); // A more complete set of tests for the behavior of trivial_abi can be found in // clang/test/SemaCXX/attr-trivial-abi.cpp @@ -3157,6 +3186,8 @@ struct [[clang::trivial_abi]] TrivialAbiNontrivialMoveCtor { }; static_assert(__is_trivially_relocatable(TrivialAbiNontrivialMoveCtor), ""); static_assert(__is_trivially_relocatable(TrivialAbiNontrivialMoveCtor[]), ""); +static_assert(__is_trivially_relocatable(const TrivialAbiNontrivialMoveCtor), ""); +static_assert(__is_trivially_relocatable(volatile TrivialAbiNontrivialMoveCtor), ""); } // namespace is_trivially_relocatable _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
