maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

revert fix for // rdar://9740328 

llvm-svn: 135010
This commit is contained in:
Fariborz Jahanian 2011-07-12 23:20:13 +00:00
parent af6e82f611
commit c87c8799ec
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/AST/ASTContext.cpp
View File

@ -5442,7 +5442,7 @@ bool ASTContext::typesAreCompatible(QualType LHS, QualType RHS,
} }
bool ASTContext::propertyTypesAreCompatible(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) { bool ASTContext::typesAreBlockPointerCompatible(QualType LHS, QualType RHS) {

1
clang/test/SemaObjCXX/property-type-mismatch.mm
View File

@ -1,5 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s // RUN: %clang_cc1 -fsyntax-only -verify %s
// rdar://9740328 // rdar://9740328
// XFAIL: *
@protocol P1; @protocol P1;