Some code simplification. ir gen for gc'able array
of objects in objc.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64992 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 69429e0..6e7d936 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -610,9 +610,7 @@
LValue &LV)
{
QualType::GCAttrTypes attr = Ctx.getObjCGCAttrKind(Ty);
- if (attr != QualType::GCNone)
- LValue::SetObjCType(attr == QualType::Weak,
- attr == QualType::Strong, LV);
+ LValue::SetObjCType(attr, LV);
}
LValue CodeGenFunction::EmitDeclRefLValue(const DeclRefExpr *E) {
@@ -767,11 +765,13 @@
BaseTypeSize));
}
- QualType ExprTy = getContext().getCanonicalType(E->getBase()->getType());
+ QualType T = E->getBase()->getType();
+ QualType ExprTy = getContext().getCanonicalType(T);
+ T = T->getAsPointerType()->getPointeeType();
return LValue::MakeAddr(Builder.CreateGEP(Base, Idx, "arrayidx"),
- ExprTy->getAsPointerType()->getPointeeType()
- .getCVRQualifiers());
+ ExprTy->getAsPointerType()->getPointeeType().getCVRQualifiers(),
+ getContext().getObjCGCAttrKind(T));
}
static
@@ -921,11 +921,13 @@
CGM.getLangOptions().getGCMode() != LangOptions::NonGC) {
QualType Ty = Field->getType();
QualType::GCAttrTypes attr = Ty.getObjCGCAttr();
- if (attr != QualType::GCNone)
+ if (attr != QualType::GCNone) {
// __weak attribute on a field is ignored.
- LValue::SetObjCType(false, attr == QualType::Strong, LV);
+ if (attr == QualType::Strong)
+ LValue::SetObjCType(QualType::Strong, LV);
+ }
else if (getContext().isObjCObjectPointerType(Ty))
- LValue::SetObjCType(false, true, LV);
+ LValue::SetObjCType(QualType::Strong, LV);
}
return LV;