r199780 - ObjectiveC driver. change to reinstate -fno-objc-legacy-dispatch behavior

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Jan 21 18:43:54 2014
New Revision: 199780

URL: http://llvm.org/viewvc/llvm-project?rev=199780&view=rev
Log:
ObjectiveC driver. change to reinstate -fno-objc-legacy-dispatch behavior 
when the deployment target is 10.5. // rdar://15852259

Modified:
    cfe/trunk/include/clang/Basic/ObjCRuntime.h

Modified: cfe/trunk/include/clang/Basic/ObjCRuntime.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/ObjCRuntime.h?rev=199780&r1=199779&r2=199780&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/ObjCRuntime.h (original)
+++ cfe/trunk/include/clang/Basic/ObjCRuntime.h Tue Jan 21 18:43:54 2014
@@ -99,14 +99,10 @@ public:
           Arch == llvm::Triple::x86_64)
         return false;
     }
-    else if (isNeXTFamily() && getVersion().getMajor() == 10) {
-      unsigned minor = 0;
-      if (getVersion().getMinor().hasValue())
-        minor = getVersion().getMinor().getValue();
-      if (minor == 5 &&
-          (Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64))
-        return false;
-    }
+    else if ((getKind() ==  MacOSX) && isNonFragile() &&
+             (getVersion() >= VersionTuple(10, 5)) &&
+             (getVersion() < VersionTuple(10, 6)))
+        return Arch != llvm::Triple::x86_64;
     // Except for deployment target of 10.5,
     // Mac runtimes use legacy dispatch everywhere now.
     return true;