diff options
| -rw-r--r-- | lib/CodeGen/CGExpr.cpp | 6 | ||||
| -rw-r--r-- | lib/CodeGen/CGValue.h | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp index 3c283605e1..9e4d66a947 100644 --- a/lib/CodeGen/CGExpr.cpp +++ b/lib/CodeGen/CGExpr.cpp @@ -542,6 +542,12 @@ LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) { ObjCGCAttr::GCAttrTypes attrType = A->getType(); LValue::SetObjCType(attrType == ObjCGCAttr::Weak, attrType == ObjCGCAttr::Strong, LV); } + else if (CGM.getLangOptions().ObjC1 && + CGM.getLangOptions().getGCMode() != LangOptions::NonGC) { + QualType ExprTy = E->getType(); + if (getContext().isObjCObjectPointerType(ExprTy)) + LValue::SetObjCType(false, true, LV); + } return LV; } else if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(E->getDecl())) { return LValue::MakeAddr(CGM.GetAddrOfFunction(FD), diff --git a/lib/CodeGen/CGValue.h b/lib/CodeGen/CGValue.h index 1c60ebf14e..5b6283f3c6 100644 --- a/lib/CodeGen/CGValue.h +++ b/lib/CodeGen/CGValue.h @@ -162,10 +162,11 @@ public: bool isObjCWeak() const { return ObjCType == Weak; } bool isObjCStrong() const { return ObjCType == Strong; } - static void SetObjCType(unsigned WeakVal, unsigned StrongVal, LValue& R) { - if (WeakVal) + static void SetObjCType(bool isWeak, bool isStrong, LValue& R) { + assert(!(isWeak == true && isStrong == true)); + if (isWeak) R.ObjCType = Weak; - else if (StrongVal) + else if (isStrong) R.ObjCType = Strong; } |