revert fix for // rdar://9740328

llvm-svn: 135010
2011-07-12 23:20:13 +00:00 · 2011-07-12 23:20:13 +00:00 · c87c8799ec
parent af6e82f611
commit c87c8799ec
2 changed files with 2 additions and 1 deletions
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/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) {
--- a/clang/test/SemaObjCXX/property-type-mismatch.mm
+++ b/clang/test/SemaObjCXX/property-type-mismatch.mm
@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 // rdar://9740328
+// XFAIL: *

@protocol P1;