[cfe-commits] r71041 - in /cfe/trunk: lib/AST/Expr.cpp test/CodeGenObjC/objc2-strong-cast-2.m

[Fariborz Jahanian]

Author: fjahanian
Date: Tue May  5 18:28:21 2009
New Revision: 71041

URL: http://llvm.org/viewvc/llvm-project?rev=71041&view=rev
Log:
Fixes a bug for objc2's gc in the presense of type-casts.


Added:
    cfe/trunk/test/CodeGenObjC/objc2-strong-cast-2.m
Modified:
    cfe/trunk/lib/AST/Expr.cpp

Modified: cfe/trunk/lib/AST/Expr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/Expr.cpp?rev=71041&r1=71040&r2=71041&view=diff

==============================================================================
--- cfe/trunk/lib/AST/Expr.cpp (original)
+++ cfe/trunk/lib/AST/Expr.cpp Tue May  5 18:28:21 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();

Added: cfe/trunk/test/CodeGenObjC/objc2-strong-cast-2.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjC/objc2-strong-cast-2.m?rev=71041&view=auto

==============================================================================
--- cfe/trunk/test/CodeGenObjC/objc2-strong-cast-2.m (added)
+++ cfe/trunk/test/CodeGenObjC/objc2-strong-cast-2.m Tue May  5 18:28:21 2009
@@ -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
+
+ at interface A
+ at 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;
+}
+