commit 4f676edd08bf1f1281b162107424141afe143055
author Fariborz Jahanian <fjahanian@apple.com> Sat Feb 21 00:30:43 2009 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Sat Feb 21 00:30:43 2009 +0000
tree e6bd6b50e01f54ad51cc778b20e15d10cf373a3b
parent eda9a5ec380f172f4e0063744eb796144a125480

Handle case of none gc'able objects regardless of their
type.


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

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index ea0fc55..a9db6db 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -405,7 +405,7 @@
     assert(0 && "Unknown LValue type");
   }
   
-  if (Dst.isObjCWeak()) {
+  if (Dst.isObjCWeak() && !Dst.isNonGC()) {
     // load of a __weak object. 
     llvm::Value *LvalueDst = Dst.getAddress();
     llvm::Value *src = Src.getScalarVal();
@@ -413,7 +413,7 @@
     return;
   }
   
-  if (Dst.isObjCStrong()) {
+  if (Dst.isObjCStrong() && !Dst.isNonGC()) {
     // load of a __strong object. 
     llvm::Value *LvalueDst = Dst.getAddress();
     llvm::Value *src = Src.getScalarVal();
@@ -629,10 +629,11 @@
       // local variables do not get their gc attribute set.
       QualType::GCAttrTypes attr = QualType::GCNone;
       // local static?
-      if (VD->getStorageClass() == VarDecl::Static)
+      if (!VD->hasLocalStorage())
         attr = getContext().getObjCGCAttrKind(E->getType());
       LV = LValue::MakeAddr(V, E->getType().getCVRQualifiers(), attr);
     }
+    LValue::SetObjCNonGC(LV, VD->hasLocalStorage());
     return LV;
   } else if (VD && VD->isFileVarDecl()) {
     LValue LV = LValue::MakeAddr(CGM.GetAddrOfGlobalVar(VD),
@@ -834,6 +835,7 @@
 LValue CodeGenFunction::EmitMemberExpr(const MemberExpr *E) {
   bool isUnion = false;
   bool isIvar = false;
+  bool isNonGC = false;
   Expr *BaseExpr = E->getBase();
   llvm::Value *BaseValue = NULL;
   unsigned CVRQualifiers=0;
@@ -857,6 +859,8 @@
     LValue BaseLV = EmitLValue(BaseExpr);
     if (BaseLV.isObjCIvar())
       isIvar = true;
+    if (BaseLV.isNonGC())
+      isNonGC = true;
     // FIXME: this isn't right for bitfields.
     BaseValue = BaseLV.getAddress();
     if (BaseExpr->getType()->isUnionType())
@@ -870,6 +874,7 @@
   LValue MemExpLV = EmitLValueForField(BaseValue, Field, isUnion,
                                        CVRQualifiers);
   LValue::SetObjCIvar(MemExpLV, isIvar);
+  LValue::SetObjCNonGC(MemExpLV, isNonGC);
   return MemExpLV;
 }