diff options
| -rw-r--r-- | lib/AST/Expr.cpp | 4 | ||||
| -rw-r--r-- | test/CodeGenObjC/objc2-strong-cast-2.m | 21 |
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp index 13d2a1be3f..77a25f6fc0 100644 --- a/lib/AST/Expr.cpp +++ b/lib/AST/Expr.cpp @@ -935,6 +935,8 @@ bool Expr::isOBJCGCCandidate() const { return cast<ParenExpr>(this)->getSubExpr()->isOBJCGCCandidate(); case ImplicitCastExprClass: return cast<ImplicitCastExpr>(this)->getSubExpr()->isOBJCGCCandidate(); + case CStyleCastExprClass: + return cast<CStyleCastExpr>(this)->getSubExpr()->isOBJCGCCandidate(); case DeclRefExprClass: case QualifiedDeclRefExprClass: { const Decl *D = cast<DeclRefExpr>(this)->getDecl(); @@ -944,7 +946,7 @@ bool Expr::isOBJCGCCandidate() const { } case MemberExprClass: { const MemberExpr *M = cast<MemberExpr>(this); - return !M->isArrow() && M->getBase()->isOBJCGCCandidate(); + return M->getBase()->isOBJCGCCandidate(); } case ArraySubscriptExprClass: return cast<ArraySubscriptExpr>(this)->getBase()->isOBJCGCCandidate(); diff --git a/test/CodeGenObjC/objc2-strong-cast-2.m b/test/CodeGenObjC/objc2-strong-cast-2.m new file mode 100644 index 0000000000..61e9b98017 --- /dev/null +++ b/test/CodeGenObjC/objc2-strong-cast-2.m @@ -0,0 +1,21 @@ +// RUN: clang-cc -triple x86_64-darwin-10 -fobjc-gc -emit-llvm -o %t %s && +// RUN: grep objc_assign_strongCast %t | count 3 && +// RUN: true + +@interface A +@end + +typedef struct s0 { + A *a[4]; +} T; + +T g0; + +void f0(id x) { + g0.a[0] = x; +} + +void f1(id x) { + ((T*) &g0)->a[0] = x; +} + |