Changeset 200114 in webkit

Timestamp:

Apr 26, 2016, 5:30:18 PM (9 years ago)

Author:

mark.lam@apple.com

Message:

Update the compatibility version check for the ObjC API's InitConstructorSupport to use dyld_get_program_sdk_version().
​https://bugs.webkit.org/show_bug.cgi?id=157048

Reviewed by Geoffrey Garen.

• API/JSWrapperMap.mm:

(supportsInitMethodConstructors):
(getJSExportProtocol):

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSWrapperMap.mm (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSWrapperMap.mm

@@ -45 +45 @@
 #include <mach-o/dyld.h>
 
-static const int32_t webkitFirstVersionWithInitConstructorSupport = 0x21A0400; // 538.4.0
+#if __has_include(<mach-o/dyld_priv.h>)
+#include <mach-o/dyld_priv.h>
+#endif
+extern "C" uint32_t dyld_get_program_sdk_version();
+
+#if PLATFORM(IOS)
+static const uint32_t webkitFirstSDKVersionWithInitConstructorSupport = 0x80000; // iOS 8.0.0
+#elif PLATFORM(MAC)
+static const uint32_t webkitFirstSDKVersionWithInitConstructorSupport = 0xA0A00; // OSX 10.10.0
+#endif
 
 @class JSObjCClassInfo;
@@ -651 +660 @@
     // There are no old clients on Apple TV, so there's no need for backwards compatibility.
     return true;
+#else
+    static uint32_t programSDKVersion = 0;
+    if (!programSDKVersion)
+        programSDKVersion = dyld_get_program_sdk_version();
+    return programSDKVersion >= webkitFirstSDKVersionWithInitConstructorSupport;
 #endif
-
-    static int32_t versionOfLinkTimeLibrary = 0;
-    if (!versionOfLinkTimeLibrary)
-        versionOfLinkTimeLibrary = NSVersionOfLinkTimeLibrary("JavaScriptCore");
-    return versionOfLinkTimeLibrary >= webkitFirstVersionWithInitConstructorSupport;
 }
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-04-26  Mark Lam  <mark.lam@apple.com>
+
+        Update the compatibility version check for the ObjC API's InitConstructorSupport to use dyld_get_program_sdk_version().
+        https://bugs.webkit.org/show_bug.cgi?id=157048
+
+        Reviewed by Geoffrey Garen.
+
+        * API/JSWrapperMap.mm:
+        (supportsInitMethodConstructors):
+        (getJSExportProtocol):
+
 2016-04-26  Benjamin Poulain  <bpoulain@apple.com>