Merge commit '53556b0787b2' from apple/stable/20200108 into swift/master

Author: git apple-llvm automerger

clang/lib/Sema/SemaExprCXX.cpp

@@ -6208,6 +6208,7 @@ QualType Sema::FindCompositePointerType(SourceLocation Loc,
   // exists.
   SmallVector<unsigned, 4> QualifierUnion;
   SmallVector<std::pair<const Type *, const Type *>, 4> MemberOfClass;
+  SmallVector<PointerAuthQualifier, 4> PtrAuthQualifier;
   QualType Composite1 = T1;
   QualType Composite2 = T2;
   unsigned NeedConstBefore = 0;
@@ -6226,6 +6227,9 @@ QualType Sema::FindCompositePointerType(SourceLocation Loc,
       QualifierUnion.push_back(
                  Composite1.getCVRQualifiers() | Composite2.getCVRQualifiers());
       MemberOfClass.push_back(std::make_pair(nullptr, nullptr));
+      PtrAuthQualifier.resize(PtrAuthQualifier.size() + 1);
+      if (Composite1.getPointerAuth() == Composite2.getPointerAuth())
+        PtrAuthQualifier.back() = Composite1.getPointerAuth();
       continue;
     }
 
@@ -6244,6 +6248,9 @@ QualType Sema::FindCompositePointerType(SourceLocation Loc,
                  Composite1.getCVRQualifiers() | Composite2.getCVRQualifiers());
       MemberOfClass.push_back(std::make_pair(MemPtr1->getClass(),
                                              MemPtr2->getClass()));
+      PtrAuthQualifier.resize(PtrAuthQualifier.size() + 1);
+      if (Composite1.getPointerAuth() == Composite2.getPointerAuth())
+        PtrAuthQualifier.back() = Composite1.getPointerAuth();
       continue;
     }
 
@@ -6299,8 +6306,11 @@ QualType Sema::FindCompositePointerType(SourceLocation Loc,
 
   // Rewrap the composites as pointers or member pointers with the union CVRs.
   auto MOC = MemberOfClass.rbegin();
+  auto PtrAuthQualIt = PtrAuthQualifier.rbegin();
   for (unsigned CVR : llvm::reverse(QualifierUnion)) {
     Qualifiers Quals = Qualifiers::fromCVRMask(CVR);
+    if (PointerAuthQualifier PtrAuthQual = *PtrAuthQualIt++)
+      Quals.setPointerAuth(PtrAuthQual);
     auto Classes = *MOC++;
     if (Classes.first && Classes.second) {
       // Rebuild member pointer type

clang/test/SemaCXX/ptrauth-qualifier.cpp

@@ -120,6 +120,16 @@ namespace test_union {
   }
 }
 
+bool test_composite_type0(bool c, int * AQ * a0, int * AQ * a1) {
+  auto t = c ? a0 : a1;
+  return a0 == a1;
+}
+
+bool test_composite_type1(bool c, int * AQ * a0, int * AQ2 * a1) {
+  auto t = c ? a0 : a1; // expected-error {{incompatible operand types ('int *__ptrauth(1,1,50) *' and 'int *__ptrauth(1,1,51) *')}}
+  return a0 == a1; // expected-error {{comparison of distinct pointer types ('int *__ptrauth(1,1,50) *' and 'int *__ptrauth(1,1,51) *')}}
+}
+
 void test_bad_call_diag(void *AQ* ptr); // expected-note{{candidate function not viable: 1st argument ('void *__ptrauth(1,1,51) *') has __ptrauth(1,1,51) qualifier, but parameter has __ptrauth(1,1,50) qualifier}} expected-note{{candidate function not viable: 1st argument ('void **') has no ptrauth qualifier, but parameter has __ptrauth(1,1,50) qualifier}}
 void test_bad_call_diag2(void ** ptr); // expected-note{{1st argument ('void *__ptrauth(1,1,50) *') has __ptrauth(1,1,50) qualifier, but parameter has no ptrauth qualifier}}