1 files changed, 6 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index a9db6db0d9..2348a11f7b 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -776,10 +776,14 @@ LValue CodeGenFunction::EmitArraySubscriptExpr(const ArraySubscriptExpr *E) {
   QualType T = E->getBase()->getType();
   QualType ExprTy = getContext().getCanonicalType(T);
   T = T->getAsPointerType()->getPointeeType();
-
-  return LValue::MakeAddr(Builder.CreateGEP(Base, Idx, "arrayidx"),
+  LValue LV = 
+           LValue::MakeAddr(Builder.CreateGEP(Base, Idx, "arrayidx"),
            ExprTy->getAsPointerType()->getPointeeType().getCVRQualifiers(),
            getContext().getObjCGCAttrKind(T));
+  if (getContext().getLangOptions().ObjC1 &&
+      getContext().getLangOptions().getGCMode() != LangOptions::NonGC)
+    LValue::SetObjCNonGC(LV, !E->hasGlobalStorage());
+  return LV;
 }
 
 static