From 82378391dfc3b2fc22f63dbf1552bd9aed39dc42 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Tue, 12 Jul 2011 23:20:13 +0000
Subject: [PATCH] revert fix for // rdar://9740328

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135010 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/AST/ASTContext.cpp                    | 2 +-
 test/SemaObjCXX/property-type-mismatch.mm | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 71b76c9d32..6eada6e22f 100644
--- 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 059793cf5c..a818b2d44c 100644
--- 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;
 
-- 
2.40.0