diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2012-12-17 18:02:43 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2012-12-17 18:02:43 +0000 |
| commit | e315cb3b30a0461ae501f8942f9d012bbeee3f90 (patch) | |
| tree | 33aeefdc50fc77eda89d3bb8cccae3acf5cba64d /lib/CodeGen/CGObjC.cpp | |
| parent | 648dd82196b09953c029d15679e32a799a1b1eb6 (diff) | |
Revert "Added support for new property helpers (GNUstep runtime)."
This reverts commit r170344. Doesn't even compile.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170351 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGObjC.cpp')
| -rw-r--r-- | lib/CodeGen/CGObjC.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp index ced5a4cb1c..deac5f6aa4 100644 --- a/lib/CodeGen/CGObjC.cpp +++ b/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().GetCppAtomicObjectGetFunction(); + CGF.CGM.getObjCRuntime().GetCppAtomicObjectFunction(); 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().GetCppAtomicObjectSetFunction(); + CGF.CGM.getObjCRuntime().GetCppAtomicObjectFunction(); CGF.EmitCall(CGF.getTypes().arrangeFreeFunctionCall(CGF.getContext().VoidTy, args, FunctionType::ExtInfo(), @@ -2800,7 +2800,8 @@ void CodeGenFunction::EmitExtendGCLifetime(llvm::Value *object) { } static bool hasAtomicCopyHelperAPI(const ObjCRuntime &runtime) { - return runtime.hasAtomicCopyHelper(); + // For now, only NeXT has these APIs. + return runtime.isNeXTFamily(); } /// GenerateObjCAtomicSetterCopyHelperFunction - Given a c++ object type with |