diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-08-05 15:52:12 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-08-05 15:52:12 +0000 |
| commit | 89f3721dee46bb184cdb39ec5a163518523ee827 (patch) | |
| tree | b20f6530c45e56245c45a850c8cc2f28d672d764 /clang/lib/CodeGen | |
| parent | e62e664656e7fce00e0b88d13ba7250319b2dd72 (diff) | |
| download | bcm5719-llvm-89f3721dee46bb184cdb39ec5a163518523ee827.tar.gz bcm5719-llvm-89f3721dee46bb184cdb39ec5a163518523ee827.zip | |
Trying to unbreak buildbot.
llvm-svn: 110339
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGObjCMac.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGObjCMac.cpp b/clang/lib/CodeGen/CGObjCMac.cpp index 0bfc94eaaf5..a453ebb4b69 100644 --- a/clang/lib/CodeGen/CGObjCMac.cpp +++ b/clang/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(); |
