From 0aa35b9cf584a4df65cf98b86366a3636ed20deb Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Mon, 13 Sep 2010 16:09:44 +0000 Subject: Block description for trivial block literals have their 'isa' field scanned regardless. llvm-svn: 113749 --- clang/lib/CodeGen/CGObjCMac.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'clang/lib/CodeGen/CGObjCMac.cpp') diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index 73074b6bbe5..766703d9e72 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/lib/CodeGen/CGObjCMac.cpp @@ -1666,8 +1666,7 @@ llvm::Constant *CGObjCCommonMac::GCBlockLayout(CodeGen::CodeGenFunction &CGF, const llvm::SmallVectorImpl &BlockLayout) { llvm::Constant *NullPtr = llvm::Constant::getNullValue(llvm::Type::getInt8PtrTy(VMContext)); - if ((CGM.getLangOptions().getGCMode() == LangOptions::NonGC) || - BlockLayout.empty()) + if (CGM.getLangOptions().getGCMode() == LangOptions::NonGC) return NullPtr; bool hasUnion = false; SkipIvars.clear(); -- cgit v1.2.3