revert fix for // rdar://9740328

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135010 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 71b76c9d3285cc2d91e9cfcceec05bf1a42a1ddf..6eada6e22f4e8022cd4da37f3b7b611e0b9d825b 100644 (file)
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -5442,7 +5442,7 @@ bool ASTContext::typesAreCompatible(QualType LHS, QualType RHS,
 }
 
 bool ASTContext::propertyTypesAreCompatible(QualType LHS, QualType RHS) {
-  return !mergeTypes(LHS, RHS, false, false).isNull();
+  return typesAreCompatible(LHS, RHS);
 }
 
 bool ASTContext::typesAreBlockPointerCompatible(QualType LHS, QualType RHS) {

diff --git a/test/SemaObjCXX/property-type-mismatch.mm b/test/SemaObjCXX/property-type-mismatch.mm
index 059793cf5ceb92b6404a1e65e2072e05110a0579..a818b2d44ca84af62f91a230d2d2684cbe2cc385 100644 (file)
--- a/test/SemaObjCXX/property-type-mismatch.mm
+++ b/test/SemaObjCXX/property-type-mismatch.mm
@@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 // rdar://9740328
+// XFAIL: *
 
 @protocol P1;