diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-01-26 00:29:22 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-01-26 00:29:22 +0000 |
| commit | a5d5fbcb440e097ba4855881c02a34dfe80d11c9 (patch) | |
| tree | 24eeb0fb6367782d11593600175ee036aa40e59f | |
| parent | cf0b9cc2f72d0bc9e23a423c90836cb092f213cd (diff) | |
Fix a regression caused by my rewriting of cast of ivar
access (was radar 7575882).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94481 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Frontend/RewriteObjC.cpp | 20 | ||||
| -rw-r--r-- | test/Rewriter/rewrite-cast-ivar-access.mm | 6 |
2 files changed, 17 insertions, 9 deletions
diff --git a/lib/Frontend/RewriteObjC.cpp b/lib/Frontend/RewriteObjC.cpp index 19c714da3d..e473adbf9e 100644 --- a/lib/Frontend/RewriteObjC.cpp +++ b/lib/Frontend/RewriteObjC.cpp @@ -4308,15 +4308,17 @@ void RewriteObjC::RewriteCastExpr(CStyleCastExpr *CE) { TypeAsString.c_str(), TypeAsString.size()); return; } - if (QT->isObjCObjectPointerType()) { - QualType ptee = QT->getAs<ObjCObjectPointerType>()->getPointeeType(); - std::string TypeAsString = "(struct "; - TypeAsString += ptee.getAsString(); - TypeAsString += "_IMPL *"; - TypeAsString += ")"; - ReplaceText(LocStart, endBuf-startBuf+1, - TypeAsString.c_str(), TypeAsString.size()); - return; + if (LangOpts.Microsoft && QT->isObjCObjectPointerType()) { + if (isa<ObjCInterfaceType>(QT->getPointeeType())) { + QualType ptee = QT->getAs<ObjCObjectPointerType>()->getPointeeType(); + std::string TypeAsString = "(struct "; + TypeAsString += ptee.getAsString(); + TypeAsString += "_IMPL *"; + TypeAsString += ")"; + ReplaceText(LocStart, endBuf-startBuf+1, + TypeAsString.c_str(), TypeAsString.size()); + return; + } } // advance the location to startArgList. const char *argPtr = startBuf; diff --git a/test/Rewriter/rewrite-cast-ivar-access.mm b/test/Rewriter/rewrite-cast-ivar-access.mm index bdda689512..177824d026 100644 --- a/test/Rewriter/rewrite-cast-ivar-access.mm +++ b/test/Rewriter/rewrite-cast-ivar-access.mm @@ -20,5 +20,11 @@ } @end +void objc_assign_strongCast(id); +void __CFAssignWithWriteBarrier(void **location, void *value) { + objc_assign_strongCast((id)value); +} + // CHECK-LP: ((struct G_IMPL *)arg)->ivar +// CHECK-LP: objc_assign_strongCast((id)value) |