Fields of ivars of struct types are considered ivars
themselves for gc API generation purposes.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59828 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 21ac806..4f2bd48 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -732,6 +732,7 @@
LValue CodeGenFunction::EmitMemberExpr(const MemberExpr *E) {
bool isUnion = false;
+ bool isIvar = false;
Expr *BaseExpr = E->getBase();
llvm::Value *BaseValue = NULL;
unsigned CVRQualifiers=0;
@@ -747,6 +748,8 @@
}
else {
LValue BaseLV = EmitLValue(BaseExpr);
+ if (BaseLV.isObjCIvar())
+ isIvar = true;
// FIXME: this isn't right for bitfields.
BaseValue = BaseLV.getAddress();
if (BaseExpr->getType()->isUnionType())
@@ -755,7 +758,9 @@
}
FieldDecl *Field = E->getMemberDecl();
- return EmitLValueForField(BaseValue, Field, isUnion, CVRQualifiers);
+ LValue MemExpLV = EmitLValueForField(BaseValue, Field, isUnion, CVRQualifiers);
+ LValue::SetObjCIvar(MemExpLV, isIvar);
+ return MemExpLV;
}
LValue CodeGenFunction::EmitLValueForField(llvm::Value* BaseValue,
@@ -937,7 +942,7 @@
llvm::Value *V = Builder.CreateStructGEP(BaseValue, Index, "tmp");
LValue LV = LValue::MakeAddr(V, Ivar->getType().getCVRQualifiers()|CVRQualifiers);
SetVarDeclObjCAttribute(getContext(), Ivar, Ivar->getType(), LV);
- LValue::SetObjCIvar(LV);
+ LValue::SetObjCIvar(LV, true);
return LV;
}