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();
return;
}
- if (Dst.isObjCStrong()) {
+ if (Dst.isObjCStrong() && !Dst.isNonGC()) {
// load of a __strong object.
llvm::Value *LvalueDst = Dst.getAddress();
llvm::Value *src = Src.getScalarVal();
// 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),
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;
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())
LValue MemExpLV = EmitLValueForField(BaseValue, Field, isUnion,
CVRQualifiers);
LValue::SetObjCIvar(MemExpLV, isIvar);
+ LValue::SetObjCNonGC(MemExpLV, isNonGC);
return MemExpLV;
}
// objective-c's ivar
bool Ivar:1;
+
+ // LValue is non-gc'able for any reason, including being a parameter or local
+ // variable.
+ bool NonGC: 1;
// objective-c's gc attributes
unsigned ObjCType : 2;
// FIXME: Convenient place to set objc flags to 0. This
// should really be done in a user-defined constructor instead.
R.ObjCType = None;
- R.Ivar = false;
+ R.Ivar = R.NonGC = false;
}
public:
}
bool isObjCIvar() const { return Ivar; }
+ bool isNonGC () const { return NonGC; }
bool isObjCWeak() const { return ObjCType == Weak; }
bool isObjCStrong() const { return ObjCType == Strong; }
static void SetObjCIvar(LValue& R, bool iValue) {
R.Ivar = iValue;
}
-
+
+ static void SetObjCNonGC(LValue& R, bool iValue) {
+ R.NonGC = iValue;
+ }
static void SetObjCType(QualType::GCAttrTypes GCAttrs, LValue& R) {
if (GCAttrs == QualType::Weak)
R.ObjCType = Weak;
else if (GCAttrs == QualType::Strong)
R.ObjCType = Strong;
+ else
+ R.ObjCType = None;
}
// simple lvalue