diff options
| author | Steve Naroff <snaroff@apple.com> | 2009-07-10 23:34:53 +0000 |
|---|---|---|
| committer | Steve Naroff <snaroff@apple.com> | 2009-07-10 23:34:53 +0000 |
| commit | 7cae42b07a3aa8a6651b9c9af26ce4fbe6fd6ae8 (patch) | |
| tree | 4dfae22ee5e84fbf995f7c11a3e62c156467572c /clang/lib/Sema/SemaExprCXX.cpp | |
| parent | 12977990966fa3e7258a77bf80727f079cd83222 (diff) | |
| download | bcm5719-llvm-7cae42b07a3aa8a6651b9c9af26ce4fbe6fd6ae8.tar.gz bcm5719-llvm-7cae42b07a3aa8a6651b9c9af26ce4fbe6fd6ae8.zip | |
This patch includes a conceptually simple, but very intrusive/pervasive change.
The idea is to segregate Objective-C "object" pointers from general C pointers (utilizing the recently added ObjCObjectPointerType). The fun starts in Sema::GetTypeForDeclarator(), where "SomeInterface *" is now represented by a single AST node (rather than a PointerType whose Pointee is an ObjCInterfaceType). Since a significant amount of code assumed ObjC object pointers where based on C pointers/structs, this patch is very tedious. It should also explain why it is hard to accomplish this in smaller, self-contained patches.
This patch does most of the "heavy lifting" related to moving from PointerType->ObjCObjectPointerType. It doesn't include all potential "cleanups". The good news is additional cleanups can be done later (some are noted in the code). This patch is so large that I didn't want to include any changes that are purely aesthetic.
By making the ObjC types truly built-in, they are much easier to work with (and require fewer "hacks"). For example, there is no need for ASTContext::isObjCIdStructType() or ASTContext::isObjCClassStructType()! We believe this change (and the follow-up cleanups) will pay dividends over time.
Given the amount of code change, I do expect some fallout from this change (though it does pass all of the clang tests). If you notice any problems, please let us know asap! Thanks.
llvm-svn: 75314
Diffstat (limited to 'clang/lib/Sema/SemaExprCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index b6c2d0521fe..d522bf29dc5 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -1482,7 +1482,8 @@ QualType Sema::CXXCheckConditionalOperands(Expr *&Cond, Expr *&LHS, Expr *&RHS, QualType Sema::FindCompositePointerType(Expr *&E1, Expr *&E2) { assert(getLangOptions().CPlusPlus && "This function assumes C++"); QualType T1 = E1->getType(), T2 = E2->getType(); - if(!T1->isPointerType() && !T2->isPointerType()) + if(!T1->isPointerType() && !T2->isPointerType() && + !T1->isObjCObjectPointerType() && !T2->isObjCObjectPointerType()) return QualType(); // C++0x 5.9p2 |
