Skip to content

Commit 1dd95b1

Browse files
committed
Fix ptrauth tests
1 parent 110795a commit 1dd95b1

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

clang/lib/Sema/SemaExprCXX.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5606,6 +5606,9 @@ bool Sema::IsCXXTriviallyRelocatableType(QualType Type) {
56065606
if (BaseElementType.hasNonTrivialObjCLifetime())
56075607
return false;
56085608

5609+
if (BaseElementType.hasAddressDiscriminatedPointerAuth())
5610+
return false;
5611+
56095612
if (BaseElementType->isIncompleteType())
56105613
return false;
56115614

clang/test/SemaCXX/ptrauth-triviality.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static_assert(!__is_trivially_constructible(S3, const S3&));
6767
static_assert(!__is_trivially_assignable(S3, const S3&));
6868
static_assert(__is_trivially_destructible(S3));
6969
static_assert(!__is_trivially_copyable(S3));
70-
static_assert(!__is_trivially_relocatable(S3));
70+
static_assert(__is_trivially_relocatable(S3));
7171
static_assert(!__is_trivially_equality_comparable(S3));
7272

7373
static_assert(!__is_trivially_constructible(Holder<S3>));
@@ -97,7 +97,7 @@ static_assert(!__is_trivially_constructible(Holder<S4>, const Holder<S4>&));
9797
static_assert(!__is_trivially_assignable(Holder<S4>, const Holder<S4>&));
9898
static_assert(__is_trivially_destructible(Holder<S4>));
9999
static_assert(!__is_trivially_copyable(Holder<S4>));
100-
static_assert(!__is_trivially_relocatable(Holder<S4>));
100+
static_assert(__is_trivially_relocatable(Holder<S4>));
101101
static_assert(!__is_trivially_equality_comparable(Holder<S4>));
102102

103103
struct PA S5 {
@@ -119,5 +119,5 @@ static_assert(!__is_trivially_constructible(Holder<S5>, const Holder<S5>&));
119119
static_assert(!__is_trivially_assignable(Holder<S5>, const Holder<S5>&));
120120
static_assert(__is_trivially_destructible(Holder<S5>));
121121
static_assert(!__is_trivially_copyable(Holder<S5>));
122-
static_assert(!__is_trivially_relocatable(Holder<S5>));
122+
static_assert(__is_trivially_relocatable(Holder<S5>));
123123
static_assert(!__is_trivially_equality_comparable(Holder<S5>));

0 commit comments

Comments
 (0)