r329608 - Revert "[ObjC] Make C++ triviality type traits available to non-trivial C"
Akira Hatanaka via cfe-commits
cfe-commits at lists.llvm.org
Mon Apr 9 12:39:27 PDT 2018
Author: ahatanak
Date: Mon Apr 9 12:39:27 2018
New Revision: 329608
URL: http://llvm.org/viewvc/llvm-project?rev=329608&view=rev
Log:
Revert "[ObjC] Make C++ triviality type traits available to non-trivial C"
This reverts commit r329289.
It was decided that we shouldn't expose the __has_* traits to C since
they are deprecated and useless.
See the discussion here:
http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20180402/thread.html#223921
Removed:
cfe/trunk/test/SemaObjC/non-trivial-struct-traits.m
Modified:
cfe/trunk/include/clang/Basic/TokenKinds.def
cfe/trunk/lib/Sema/SemaExprCXX.cpp
Modified: cfe/trunk/include/clang/Basic/TokenKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TokenKinds.def?rev=329608&r1=329607&r2=329608&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TokenKinds.def (original)
+++ cfe/trunk/include/clang/Basic/TokenKinds.def Mon Apr 9 12:39:27 2018
@@ -433,12 +433,12 @@ TYPE_TRAIT_1(__has_nothrow_assign, HasNo
TYPE_TRAIT_1(__has_nothrow_move_assign, HasNothrowMoveAssign, KEYCXX)
TYPE_TRAIT_1(__has_nothrow_copy, HasNothrowCopy, KEYCXX)
TYPE_TRAIT_1(__has_nothrow_constructor, HasNothrowConstructor, KEYCXX)
-TYPE_TRAIT_1(__has_trivial_assign, HasTrivialAssign, KEYALL)
-TYPE_TRAIT_1(__has_trivial_move_assign, HasTrivialMoveAssign, KEYALL)
-TYPE_TRAIT_1(__has_trivial_copy, HasTrivialCopy, KEYALL)
-TYPE_TRAIT_1(__has_trivial_constructor, HasTrivialDefaultConstructor, KEYALL)
-TYPE_TRAIT_1(__has_trivial_move_constructor, HasTrivialMoveConstructor, KEYALL)
-TYPE_TRAIT_1(__has_trivial_destructor, HasTrivialDestructor, KEYALL)
+TYPE_TRAIT_1(__has_trivial_assign, HasTrivialAssign, KEYCXX)
+TYPE_TRAIT_1(__has_trivial_move_assign, HasTrivialMoveAssign, KEYCXX)
+TYPE_TRAIT_1(__has_trivial_copy, HasTrivialCopy, KEYCXX)
+TYPE_TRAIT_1(__has_trivial_constructor, HasTrivialDefaultConstructor, KEYCXX)
+TYPE_TRAIT_1(__has_trivial_move_constructor, HasTrivialMoveConstructor, KEYCXX)
+TYPE_TRAIT_1(__has_trivial_destructor, HasTrivialDestructor, KEYCXX)
TYPE_TRAIT_1(__has_virtual_destructor, HasVirtualDestructor, KEYCXX)
TYPE_TRAIT_1(__is_abstract, IsAbstract, KEYCXX)
TYPE_TRAIT_1(__is_aggregate, IsAggregate, KEYCXX)
Modified: cfe/trunk/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprCXX.cpp?rev=329608&r1=329607&r2=329608&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprCXX.cpp Mon Apr 9 12:39:27 2018
@@ -4521,8 +4521,6 @@ static bool EvaluateUnaryTypeTrait(Sema
// does not correctly compute triviality in the presence of multiple special
// members of the same kind. Revisit this once the g++ bug is fixed.
case UTT_HasTrivialDefaultConstructor:
- if (T.isNonTrivialToPrimitiveDefaultInitialize())
- return false;
// http://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html:
// If __is_pod (type) is true then the trait is true, else if type is
// a cv class or union type (or array thereof) with a trivial default
@@ -4533,11 +4531,7 @@ static bool EvaluateUnaryTypeTrait(Sema
return RD->hasTrivialDefaultConstructor() &&
!RD->hasNonTrivialDefaultConstructor();
return false;
- case UTT_HasTrivialMoveConstructor: {
- QualType::PrimitiveCopyKind PCK =
- T.isNonTrivialToPrimitiveDestructiveMove();
- if (PCK != QualType::PCK_Trivial && PCK != QualType::PCK_VolatileTrivial)
- return false;
+ case UTT_HasTrivialMoveConstructor:
// This trait is implemented by MSVC 2012 and needed to parse the
// standard library headers. Specifically this is used as the logic
// behind std::is_trivially_move_constructible (20.9.4.3).
@@ -4546,11 +4540,7 @@ static bool EvaluateUnaryTypeTrait(Sema
if (CXXRecordDecl *RD = C.getBaseElementType(T)->getAsCXXRecordDecl())
return RD->hasTrivialMoveConstructor() && !RD->hasNonTrivialMoveConstructor();
return false;
- }
- case UTT_HasTrivialCopy: {
- QualType::PrimitiveCopyKind PCK = T.isNonTrivialToPrimitiveCopy();
- if (PCK != QualType::PCK_Trivial && PCK != QualType::PCK_VolatileTrivial)
- return false;
+ case UTT_HasTrivialCopy:
// http://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html:
// If __is_pod (type) is true or type is a reference type then
// the trait is true, else if type is a cv class or union type
@@ -4562,12 +4552,7 @@ static bool EvaluateUnaryTypeTrait(Sema
return RD->hasTrivialCopyConstructor() &&
!RD->hasNonTrivialCopyConstructor();
return false;
- }
- case UTT_HasTrivialMoveAssign: {
- QualType::PrimitiveCopyKind PCK =
- T.isNonTrivialToPrimitiveDestructiveMove();
- if (PCK != QualType::PCK_Trivial && PCK != QualType::PCK_VolatileTrivial)
- return false;
+ case UTT_HasTrivialMoveAssign:
// This trait is implemented by MSVC 2012 and needed to parse the
// standard library headers. Specifically it is used as the logic
// behind std::is_trivially_move_assignable (20.9.4.3)
@@ -4576,11 +4561,7 @@ static bool EvaluateUnaryTypeTrait(Sema
if (CXXRecordDecl *RD = C.getBaseElementType(T)->getAsCXXRecordDecl())
return RD->hasTrivialMoveAssignment() && !RD->hasNonTrivialMoveAssignment();
return false;
- }
- case UTT_HasTrivialAssign: {
- QualType::PrimitiveCopyKind PCK = T.isNonTrivialToPrimitiveCopy();
- if (PCK != QualType::PCK_Trivial && PCK != QualType::PCK_VolatileTrivial)
- return false;
+ case UTT_HasTrivialAssign:
// http://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html:
// If type is const qualified or is a reference type then the
// trait is false. Otherwise if __is_pod (type) is true then the
@@ -4601,7 +4582,6 @@ static bool EvaluateUnaryTypeTrait(Sema
return RD->hasTrivialCopyAssignment() &&
!RD->hasNonTrivialCopyAssignment();
return false;
- }
case UTT_IsDestructible:
case UTT_IsTriviallyDestructible:
case UTT_IsNothrowDestructible:
@@ -4652,8 +4632,6 @@ static bool EvaluateUnaryTypeTrait(Sema
return true;
case UTT_HasTrivialDestructor:
- if (T.isDestructedType() == QualType::DK_nontrivial_c_struct)
- return false;
// http://gcc.gnu.org/onlinedocs/gcc/Type-Traits.html
// If __is_pod (type) is true or type is a reference type
// then the trait is true, else if type is a cv class or union
Removed: cfe/trunk/test/SemaObjC/non-trivial-struct-traits.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/non-trivial-struct-traits.m?rev=329607&view=auto
==============================================================================
--- cfe/trunk/test/SemaObjC/non-trivial-struct-traits.m (original)
+++ cfe/trunk/test/SemaObjC/non-trivial-struct-traits.m (removed)
@@ -1,32 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -fobjc-arc -verify %s
-
-// expected-no-diagnostics
-
-struct Trivial {
- int x;
-};
-
-struct NonTrivial {
- id x;
-};
-
-int trivial_assign[__has_trivial_assign(struct Trivial) ? 1 : -1];
-int trivial_move_assign[__has_trivial_move_assign(struct Trivial) ? 1 : -1];
-int trivial_copy_constructor[__has_trivial_copy(struct Trivial) ? 1 : -1];
-int trivial_move_constructor[__has_trivial_move_constructor(struct Trivial) ? 1 : -1];
-int trivial_constructor[__has_trivial_constructor(struct Trivial) ? 1 : -1];
-int trivial_destructor[__has_trivial_destructor(struct Trivial) ? 1 : -1];
-
-int non_trivial_assign[__has_trivial_assign(struct NonTrivial) ? -1 : 1];
-int non_trivial_move_assign[__has_trivial_move_assign(struct NonTrivial) ? -1 : 1];
-int non_trivial_copy_constructor[__has_trivial_copy(struct NonTrivial) ? -1 : 1];
-int non_trivial_move_constructor[__has_trivial_move_constructor(struct NonTrivial) ? -1 : 1];
-int non_trivial_constructor[__has_trivial_constructor(struct NonTrivial) ? -1 : 1];
-int non_trivial_destructor[__has_trivial_destructor(struct NonTrivial) ? -1 : 1];
-
-int volatile_trivial_assign[__has_trivial_assign(volatile int) ? 1 : -1];
-int volatile_trivial_move_assign[__has_trivial_move_assign(volatile int) ? 1 : -1];
-int volatile_trivial_copy_constructor[__has_trivial_copy(volatile int) ? 1 : -1];
-int volatile_trivial_move_constructor[__has_trivial_move_constructor(volatile int) ? 1 : -1];
-int volatile_trivial_copy_constructor2[__has_trivial_copy(volatile struct Trivial) ? 1 : -1];
-int volatile_trivial_move_constructor2[__has_trivial_move_constructor(volatile struct Trivial) ? 1 : -1];
More information about the cfe-commits
mailing list