diff options
| author | John McCall <rjmccall@apple.com> | 2012-08-21 02:47:43 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2012-08-21 02:47:43 +0000 |
| commit | 3deb1ad40ca62a6d530650bfe9b00cf78749dae8 (patch) | |
| tree | b0a0230e2d1a21831a75111ff1f0c7064c1c5b1f /clang/lib/CodeGen/CGObjC.cpp | |
| parent | 3e358ccf92934f97ce68af764f60e15e814c71a7 (diff) | |
| download | bcm5719-llvm-3deb1ad40ca62a6d530650bfe9b00cf78749dae8.tar.gz bcm5719-llvm-3deb1ad40ca62a6d530650bfe9b00cf78749dae8.zip | |
Screw around with ObjCRuntime some more, changing the
diagnostics for bad deployment targets and adding a few
more predicates. Includes a patch by Jonathan Schleifer
to enable ARC for ObjFW.
llvm-svn: 162252
Diffstat (limited to 'clang/lib/CodeGen/CGObjC.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index e0762846dc1..4a8a07994ad 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -1706,7 +1706,7 @@ static llvm::Constant *createARCRuntimeFunction(CodeGenModule &CGM, // references to the runtime support library. We don't really // permit this to fail, but we need a particular relocation style. if (llvm::Function *f = dyn_cast<llvm::Function>(fn)) { - if (!CGM.getLangOpts().ObjCRuntime.hasARC()) + if (!CGM.getLangOpts().ObjCRuntime.hasNativeARC()) f->setLinkage(llvm::Function::ExternalWeakLinkage); // set nonlazybind attribute for these APIs for performance. if (fnName == "objc_retain" || fnName == "objc_release") @@ -2739,7 +2739,7 @@ void CodeGenFunction::EmitObjCAutoreleasePoolStmt( // Keep track of the current cleanup stack depth. RunCleanupsScope Scope(*this); - if (CGM.getLangOpts().ObjCRuntime.hasARC()) { + if (CGM.getLangOpts().ObjCRuntime.hasNativeARC()) { llvm::Value *token = EmitObjCAutoreleasePoolPush(); EHStack.pushCleanup<CallObjCAutoreleasePoolObject>(NormalCleanup, token); } else { |
