[cfe-commits] r135010 - in /cfe/trunk: lib/AST/ASTContext.cpp test/SemaObjCXX/property-type-mismatch.mm

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Jul 12 18:20:13 2011
New Revision: 135010

URL: http://llvm.org/viewvc/llvm-project?rev=135010&view=rev
Log:
revert fix for // rdar://9740328

Modified:
    cfe/trunk/lib/AST/ASTContext.cpp
    cfe/trunk/test/SemaObjCXX/property-type-mismatch.mm

Modified: cfe/trunk/lib/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTContext.cpp?rev=135010&r1=135009&r2=135010&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ASTContext.cpp (original)
+++ cfe/trunk/lib/AST/ASTContext.cpp Tue Jul 12 18:20:13 2011
@@ -5442,7 +5442,7 @@
 }
 
 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) {

Modified: cfe/trunk/test/SemaObjCXX/property-type-mismatch.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/property-type-mismatch.mm?rev=135010&r1=135009&r2=135010&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjCXX/property-type-mismatch.mm (original)
+++ cfe/trunk/test/SemaObjCXX/property-type-mismatch.mm Tue Jul 12 18:20:13 2011
@@ -1,5 +1,6 @@
 // RUN: %clang_cc1 -fsyntax-only -verify %s
 // rdar://9740328
+// XFAIL: *
 
 @protocol P1;