Skip to content

Commit bbf322b

Browse files
author
Fariborz Jahanian
committed
ObjectiveC driver. change to reinstate -fno-objc-legacy-dispatch behavior
when the deployment target is 10.5. // rdar://15852259 llvm-svn: 199780
1 parent c278c00 commit bbf322b

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

clang/include/clang/Basic/ObjCRuntime.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,10 @@ class ObjCRuntime {
9999
Arch == llvm::Triple::x86_64)
100100
return false;
101101
}
102-
else if (isNeXTFamily() && getVersion().getMajor() == 10) {
103-
unsigned minor = 0;
104-
if (getVersion().getMinor().hasValue())
105-
minor = getVersion().getMinor().getValue();
106-
if (minor == 5 &&
107-
(Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64))
108-
return false;
109-
}
102+
else if ((getKind() == MacOSX) && isNonFragile() &&
103+
(getVersion() >= VersionTuple(10, 5)) &&
104+
(getVersion() < VersionTuple(10, 6)))
105+
return Arch != llvm::Triple::x86_64;
110106
// Except for deployment target of 10.5,
111107
// Mac runtimes use legacy dispatch everywhere now.
112108
return true;

0 commit comments

Comments
 (0)