aboutsummaryrefslogtreecommitdiff
path: root/lib/CodeGen/CGObjCMac.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2010-08-05 15:52:12 +0000
committerFariborz Jahanian <fjahanian@apple.com>2010-08-05 15:52:12 +0000
commit5af1235d48d7bde471eb63fe6e1729be7c0308b8 (patch)
tree7c82e2ce6f24d9201d5ceeca4780117e6c76d6fb /lib/CodeGen/CGObjCMac.cpp
parent9b44eaf402c991d20306e6224a6ce6e4ea02ce48 (diff)
Trying to unbreak buildbot.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@110339 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGObjCMac.cpp')
-rw-r--r--lib/CodeGen/CGObjCMac.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/CGObjCMac.cpp b/lib/CodeGen/CGObjCMac.cpp
index 0bfc94eaaf..a453ebb4b6 100644
--- a/lib/CodeGen/CGObjCMac.cpp
+++ b/lib/CodeGen/CGObjCMac.cpp
@@ -1711,7 +1711,8 @@ llvm::Constant *CGObjCCommonMac::GCBlockLayout(CodeGen::CodeGenFunction &CGF,
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();