diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2012-10-15 22:23:53 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2012-10-15 22:23:53 +0000 |
| commit | bd847cc5622cabc9abb1a59e950981cdf9418f96 (patch) | |
| tree | 9a6b39bba9153c91bf728efdaaa2006c5bf9dcdf /clang/lib/CodeGen/CGObjC.cpp | |
| parent | 345b09cb8064796467fae90c4b800923a461d308 (diff) | |
| download | bcm5719-llvm-bd847cc5622cabc9abb1a59e950981cdf9418f96.tar.gz bcm5719-llvm-bd847cc5622cabc9abb1a59e950981cdf9418f96.zip | |
Un-revert r164907 and r164902 (+ follow-ups), 10.6 build fix to follow.
llvm-svn: 165988
Diffstat (limited to 'clang/lib/CodeGen/CGObjC.cpp')
| -rw-r--r-- | clang/lib/CodeGen/CGObjC.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp index cd1ed8913d4..cea97317889 100644 --- a/clang/lib/CodeGen/CGObjC.cpp +++ b/clang/lib/CodeGen/CGObjC.cpp @@ -1041,12 +1041,7 @@ static bool hasTrivialSetExpr(const ObjCPropertyImplDecl *PID) { static bool UseOptimizedSetter(CodeGenModule &CGM) { if (CGM.getLangOpts().getGC() != LangOptions::NonGC) return false; - const TargetInfo &Target = CGM.getContext().getTargetInfo(); - - if (Target.getPlatformName() != "macosx") - return false; - - return Target.getPlatformMinVersion() >= VersionTuple(10, 8); + return CGM.getLangOpts().ObjCRuntime.hasOptimizedSetter(); } void @@ -1106,7 +1101,7 @@ CodeGenFunction::generateObjCSetterBody(const ObjCImplementationDecl *classImpl, llvm::Value *setOptimizedPropertyFn = 0; llvm::Value *setPropertyFn = 0; if (UseOptimizedSetter(CGM)) { - // 10.8 code and GC is off + // 10.8 and iOS 6.0 code and GC is off setOptimizedPropertyFn = CGM.getObjCRuntime() .GetOptimizedPropertySetFunction(strategy.isAtomic(), |
