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 | beea120d6e10fa22fff7fe94bc961700d631dcba (patch) | |
| tree | d5b9f1d888f1db97634b2cc12391df11a811bcbc /clang/lib/CodeGen/CGObjC.cpp | |
| parent | d05e6b58175d0e900d45f427b09cafb46afa96d3 (diff) | |
| download | bcm5719-llvm-beea120d6e10fa22fff7fe94bc961700d631dcba.tar.gz bcm5719-llvm-beea120d6e10fa22fff7fe94bc961700d631dcba.zip | |
Revert "Added support for new property helpers (GNUstep runtime)."
This reverts commit r170344. Doesn't even compile.
llvm-svn: 170351
Diffstat (limited to 'clang/lib/CodeGen/CGObjC.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjC.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index ced5a4cb1c8..deac5f6aa4f 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().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 |
