commit 5af1235d48d7bde471eb63fe6e1729be7c0308b8
author Fariborz Jahanian <fjahanian@apple.com> Thu Aug 05 15:52:12 2010 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Thu Aug 05 15:52:12 2010 +0000
tree 7c82e2ce6f24d9201d5ceeca4780117e6c76d6fb
parent 9b44eaf402c991d20306e6224a6ce6e4ea02ce48

Trying to unbreak buildbot.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110339 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGObjCMac.cpp

diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 0bfc94e..a453ebb 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -1711,7 +1711,8 @@
               const llvm::SmallVectorImpl<const BlockDeclRefExpr *> &DeclRefs) {
   llvm::Constant *NullPtr = 
     llvm::Constant::getNullValue(llvm::Type::getInt8PtrTy(VMContext));
-  if (DeclRefs.empty())
+  if ((CGM.getLangOptions().getGCMode() == LangOptions::NonGC) ||
+      DeclRefs.empty())
     return NullPtr;
   SkipIvars.clear();
   IvarsInfo.clear();