diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2012-12-17 18:54:24 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2012-12-17 18:54:24 +0000 |
| commit | 0d75e0600be2313b9893c1a586b6269316079517 (patch) | |
| tree | a4c5a6e2c1c58c26f5162b12be6cc81500121197 /clang/lib/CodeGen/CGObjC.cpp | |
| parent | e3f4119b064da4bad36bb3f1b60c77e0ccef3081 (diff) | |
| download | bcm5719-llvm-0d75e0600be2313b9893c1a586b6269316079517.tar.gz bcm5719-llvm-0d75e0600be2313b9893c1a586b6269316079517.zip | |
Reapply r170344, this time without forgetting to commit the header changes.
llvm-svn: 170354
Diffstat (limited to 'clang/lib/CodeGen/CGObjC.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjC.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index deac5f6aa4f..ced5a4cb1c8 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -772,7 +772,7 @@ static void emitCPPObjectAtomicGetterCall(CodeGenFunction &CGF, args.add(RValue::get(AtomicHelperFn), CGF.getContext().VoidPtrTy); llvm::Value *copyCppAtomicObjectFn = - CGF.CGM.getObjCRuntime().GetCppAtomicObjectFunction(); + CGF.CGM.getObjCRuntime().GetCppAtomicObjectGetFunction(); CGF.EmitCall(CGF.getTypes().arrangeFreeFunctionCall(CGF.getContext().VoidTy, args, FunctionType::ExtInfo(), @@ -1007,7 +1007,7 @@ static void emitCPPObjectAtomicSetterCall(CodeGenFunction &CGF, args.add(RValue::get(AtomicHelperFn), CGF.getContext().VoidPtrTy); llvm::Value *copyCppAtomicObjectFn = - CGF.CGM.getObjCRuntime().GetCppAtomicObjectFunction(); + CGF.CGM.getObjCRuntime().GetCppAtomicObjectSetFunction(); CGF.EmitCall(CGF.getTypes().arrangeFreeFunctionCall(CGF.getContext().VoidTy, args, FunctionType::ExtInfo(), @@ -2800,8 +2800,7 @@ void CodeGenFunction::EmitExtendGCLifetime(llvm::Value *object) { } static bool hasAtomicCopyHelperAPI(const ObjCRuntime &runtime) { - // For now, only NeXT has these APIs. - return runtime.isNeXTFamily(); + return runtime.hasAtomicCopyHelper(); } /// GenerateObjCAtomicSetterCopyHelperFunction - Given a c++ object type with |
