Author: fjahanian
Date: Thu Nov 18 16:39:16 2010
New Revision: 119751

URL: http://llvm.org/viewvc/llvm-project?rev=119751&view=rev
Log:
Fix a bug where write-barriers for assignment through reference
types was not being generated for objc pointers.
// rdar://8681766.

Added:
    cfe/trunk/test/CodeGenObjCXX/refence-assign-write-barrier.mm
Modified:
    cfe/trunk/lib/CodeGen/CGExpr.cpp

Modified: cfe/trunk/lib/CodeGen/CGExpr.cpp
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExpr.cpp?rev=119751&r1=119750&r2=119751&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExpr.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExpr.cpp Thu Nov 18 16:39:16 2010
@@ -1198,7 +1198,7 @@
       V = Builder.CreateLoad(V, "tmp");
 
     LValue LV = MakeAddrLValue(V, E->getType(), Alignment);
-    if (NonGCable) {
+    if (NonGCable && !VD->getType()->isReferenceType()) {
       LV.getQuals().removeObjCGCAttr();
       LV.setNonGC(true);
     }

Added: cfe/trunk/test/CodeGenObjCXX/refence-assign-write-barrier.mm
URL: 
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/refence-assign-write-barrier.mm?rev=119751&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenObjCXX/refence-assign-write-barrier.mm (added)
+++ cfe/trunk/test/CodeGenObjCXX/refence-assign-write-barrier.mm Thu Nov 18 
16:39:16 2010
@@ -0,0 +1,20 @@
+// RUN: %clang_cc1 -fobjc-gc -triple x86_64-apple-darwin10 -emit-llvm -o - %s 
| FileCheck %s
+// rdar://8681766
+
+...@interface NSArray 
+- (NSArray*) retain;
+- (void) release;
+...@end
+
+void NSAssignArray(NSArray*& target, NSArray* newValue)
+{
+        if (target == newValue)
+                return;
+
+        NSArray* oldValue = target;
+
+        target = [newValue retain];
+
+        [oldValue release];
+}
+// CHECK: {{call.* @objc_assign_strongCast}}


_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

Reply via email to