commit 7052266069a1396d2cbd58ff1ead12d5fe8aa5dc
author Fariborz Jahanian <fjahanian@apple.com> Thu Nov 20 20:53:20 2008 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Thu Nov 20 20:53:20 2008 +0000
tree 4d4fcc47b50803ea159c7f9463408882c2e2b0bc
parent 444b6bf96ff1f7c7253e494f64d961febbb27ac6

Support generation of objc_assign_ivar for ivar
write-barriers.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59748 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index a9cf453..21ac806 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -372,7 +372,10 @@
     // load of a __strong object. 
     llvm::Value *LvalueDst = Dst.getAddress();
     llvm::Value *src = Src.getScalarVal();
-    CGM.getObjCRuntime().EmitObjCGlobalAssign(*this, src, LvalueDst);
+    if (Dst.isObjCIvar())
+      CGM.getObjCRuntime().EmitObjCIvarAssign(*this, src, LvalueDst);
+    else
+      CGM.getObjCRuntime().EmitObjCGlobalAssign(*this, src, LvalueDst);
     return;
   }
   
@@ -523,7 +526,7 @@
 
 /// SetVarDeclObjCAttribute - Set __weak/__strong attributes into the LValue
 /// object.
-static void SetVarDeclObjCAttribute(ASTContext &Ctx, const VarDecl *VD, 
+static void SetVarDeclObjCAttribute(ASTContext &Ctx, const Decl *VD, 
                                     const QualType &Ty, LValue &LV)
 {
   if (const ObjCGCAttr *A = VD->getAttr<ObjCGCAttr>()) {
@@ -932,7 +935,10 @@
   unsigned Index = CGM.getTypes().getLLVMFieldNo(Ivar);
   
   llvm::Value *V = Builder.CreateStructGEP(BaseValue, Index, "tmp");
-  return LValue::MakeAddr(V, Ivar->getType().getCVRQualifiers()|CVRQualifiers);
+  LValue LV = LValue::MakeAddr(V, Ivar->getType().getCVRQualifiers()|CVRQualifiers);
+  SetVarDeclObjCAttribute(getContext(), Ivar, Ivar->getType(), LV);
+  LValue::SetObjCIvar(LV);
+  return LV;
 }
 
 LValue CodeGenFunction::EmitObjCIvarRefLValue(const ObjCIvarRefExpr *E) {