diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-03-24 21:00:27 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-03-24 21:00:27 +0000 |
| commit | 9b37b1d6bbaa04ce8c4adf628cc4fa92994176a6 (patch) | |
| tree | 2520a21917902701647e476b6ff67ac7ec740c4b | |
| parent | 583e05d8ce8a73deb84d5b4e78fa30fa98ff22a1 (diff) | |
| download | bcm5719-llvm-9b37b1d6bbaa04ce8c4adf628cc4fa92994176a6.tar.gz bcm5719-llvm-9b37b1d6bbaa04ce8c4adf628cc4fa92994176a6.zip | |
Allow conversion of qualified Class type to unqualified
Class type to match gcc's. Fixes radar 7789113.
llvm-svn: 99425
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 6 | ||||
| -rw-r--r-- | clang/test/SemaObjC/comptypes-7.m | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 97f520d86f8..9dddc2093af 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -4594,13 +4594,15 @@ Sema::AssignConvertType Sema::CheckObjCPointerTypesForAssignment(QualType lhsType, QualType rhsType) { if (lhsType->isObjCBuiltinType()) { // Class is not compatible with ObjC object pointers. - if (lhsType->isObjCClassType() && !rhsType->isObjCBuiltinType()) + if (lhsType->isObjCClassType() && !rhsType->isObjCBuiltinType() && + !rhsType->isObjCQualifiedClassType()) return IncompatiblePointer; return Compatible; } if (rhsType->isObjCBuiltinType()) { // Class is not compatible with ObjC object pointers. - if (rhsType->isObjCClassType() && !lhsType->isObjCBuiltinType()) + if (rhsType->isObjCClassType() && !lhsType->isObjCBuiltinType() && + !lhsType->isObjCQualifiedClassType()) return IncompatiblePointer; return Compatible; } diff --git a/clang/test/SemaObjC/comptypes-7.m b/clang/test/SemaObjC/comptypes-7.m index fedad1bd81f..2519c41c829 100644 --- a/clang/test/SemaObjC/comptypes-7.m +++ b/clang/test/SemaObjC/comptypes-7.m @@ -66,5 +66,10 @@ int main() if (obj_C == j) foo() ; // expected-warning {{comparison of distinct pointer types ('Class' and 'int *')}} if (j == obj_C) foo() ; // expected-warning {{comparison of distinct pointer types ('int *' and 'Class')}} + Class bar1 = Nil; + Class <MyProtocol> bar = Nil; + bar = bar1; + bar1 = bar; + return 0; } |
