[cfe-commits] r71044 - in /cfe/branches/Apple/Dib: lib/AST/Expr.cpp test/CodeGenObjC/objc2-strong-cast-2.m

[Mike Stump]

Author: mrs
Date: Tue May  5 19:06:05 2009
New Revision: 71044

URL: http://llvm.org/viewvc/llvm-project?rev=71044&view=rev
Log:
Merge in 71041:

Fixes a bug for objc2's gc in the presense of type-casts.

Added:
    cfe/branches/Apple/Dib/test/CodeGenObjC/objc2-strong-cast-2.m
      - copied unchanged from r71041, cfe/trunk/test/CodeGenObjC/objc2-strong-cast-2.m
Modified:
    cfe/branches/Apple/Dib/lib/AST/Expr.cpp

Modified: cfe/branches/Apple/Dib/lib/AST/Expr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/AST/Expr.cpp?rev=71044&r1=71043&r2=71044&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/AST/Expr.cpp (original)
+++ cfe/branches/Apple/Dib/lib/AST/Expr.cpp Tue May  5 19:06:05 2009
@@ -935,6 +935,8 @@
     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 @@
   }
   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();