diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-07-12 23:20:13 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-07-12 23:20:13 +0000 |
| commit | 82378391dfc3b2fc22f63dbf1552bd9aed39dc42 (patch) | |
| tree | 3bd4bc05ade33f37c50c4e367414eb9cd538eaa0 /lib/AST/ASTContext.cpp | |
| parent | 548e478b8bd02b0295bc4efd0c282337f00646fd (diff) | |
revert fix for // rdar://9740328
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@135010 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ASTContext.cpp')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |