More objc gc's ir-gen fixes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65097 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index aa1585b..5da0de9 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -626,8 +626,12 @@
else {
llvm::Value *V = LocalDeclMap[VD];
assert(V && "BlockVarDecl not entered in LocalDeclMap?");
- LV = LValue::MakeAddr(V, E->getType().getCVRQualifiers(),
- getContext().getObjCGCAttrKind(E->getType()));
+ // local variables do not get their gc attribute set.
+ QualType::GCAttrTypes attr = QualType::GCNone;
+ // local static?
+ if (VD->getStorageClass() == VarDecl::Static)
+ attr = getContext().getObjCGCAttrKind(E->getType());
+ LV = LValue::MakeAddr(V, E->getType().getCVRQualifiers(), attr);
}
return LV;
} else if (VD && VD->isFileVarDecl()) {
@@ -665,7 +669,8 @@
{
QualType T = E->getSubExpr()->getType()->getAsPointerType()->getPointeeType();
return LValue::MakeAddr(EmitScalarExpr(E->getSubExpr()),
- ExprTy->getAsPointerType()->getPointeeType().getCVRQualifiers(),
+ ExprTy->getAsPointerType()->getPointeeType()
+ .getCVRQualifiers(),
getContext().getObjCGCAttrKind(T));
}
case UnaryOperator::Real: