From f8a27a96e2f0d5078e7836fd831c292a070162d1 Mon Sep 17 00:00:00 2001 From: Akira Hatanaka Date: Sat, 15 Apr 2017 05:44:27 +0000 Subject: Revert "[ObjC] Use empty Objective-C collection literal constants when" This reverts commit r300389. There were mistakes in the changes I made to CodeGen. llvm-svn: 300391 --- clang/lib/CodeGen/CGObjC.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'clang/lib/CodeGen/CGObjC.cpp') diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index 067718e2b8e..c011ab4dfc9 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -117,22 +117,10 @@ llvm::Value *CodeGenFunction::EmitObjCCollectionLiteral(const Expr *E, const ObjCArrayLiteral *ALE = dyn_cast(E); if (!ALE) DLE = cast(E); - - // Optimize empty collections by referencing constants, when available. + + // Compute the type of the array we're initializing. uint64_t NumElements = ALE ? ALE->getNumElements() : DLE->getNumElements(); - if (NumElements == 0 && CGM.getLangOpts().ObjCRuntime.hasEmptyCollections()) { - StringRef ConstantName = ALE ? "__NSArray0__" : "__NSDictionary0__"; - QualType IdTy(CGM.getContext().getObjCIdType()); - llvm::Constant *Constant = - CGM.CreateRuntimeVariable(ConvertType(IdTy), ConstantName); - LValue LV = LValue::MakeAddr(Constant, IdTy, - Context.getTypeAlignInChars(IdTy), Context); - return Builder.CreateBitCast(EmitLoadOfScalar(LV, E->getLocStart()), - ConvertType(E->getType())); - } - - // Compute the type of the array we're initializing. llvm::APInt APNumElements(Context.getTypeSize(Context.getSizeType()), NumElements); QualType ElementType = Context.getObjCIdType().withConst(); -- cgit v1.2.3