157048 2016-04-26 15:31:45 -0700 Update the compatibility version check for the ObjC API's InitConstructorSupport to use dyld_get_program_sdk_version(). 2016-04-28 22:10:56 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam commit-queue ggaren keith_miller mitz msaboff saam webkit-bug-importer oldest_to_newest 1187544 0 mark.lam 2016-04-26 15:31:45 -0700 Patch coming. 1187547 1 mark.lam 2016-04-26 15:35:55 -0700 <rdar://problem/25093101> 1187567 2 277419 mark.lam 2016-04-26 16:03:43 -0700 Created attachment 277419 proposed patch. 1187587 3 277419 ggaren 2016-04-26 17:05:15 -0700 Comment on attachment 277419 proposed patch. r=me 1187593 4 mark.lam 2016-04-26 17:30:30 -0700 Thanks for the review. Landed in r200114: <http://trac.webkit.org/r200114>. 1187631 5 277419 mitz 2016-04-26 19:36:40 -0700 Comment on attachment 277419 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=277419&action=review > Source/JavaScriptCore/API/JSWrapperMap.mm:50 > +#if __has_include(<mach-o/dyld_priv.h>) > +#include <mach-o/dyld_priv.h> > +#endif > +extern "C" uint32_t dyld_get_program_sdk_version(); It’s incorrect to use __has_include to check for private headers. Instead, check for USE(APPLE_INTERNAL_SDK). > Source/JavaScriptCore/API/JSWrapperMap.mm:55 > +static const uint32_t webkitFirstSDKVersionWithInitConstructorSupport = 0x80000; // iOS 8.0.0 > +#elif PLATFORM(MAC) > +static const uint32_t webkitFirstSDKVersionWithInitConstructorSupport = 0xA0A00; // OSX 10.10.0 It doesn’t make sense to use “webkit” in these names, which aren’t WebKit versions. 1187884 6 mark.lam 2016-04-27 11:49:19 -0700 (In reply to comment #5) > It’s incorrect to use __has_include to check for private headers. Instead, > check for USE(APPLE_INTERNAL_SDK). > ... > It doesn’t make sense to use “webkit” in these names, which aren’t WebKit > versions. I'll address these in https://bugs.webkit.org/show_bug.cgi?id=157096. 1188508 7 277419 ap 2016-04-28 22:10:56 -0700 Comment on attachment 277419 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=277419&action=review > Source/JavaScriptCore/API/JSWrapperMap.mm:665 > + static uint32_t programSDKVersion = 0; > + if (!programSDKVersion) > + programSDKVersion = dyld_get_program_sdk_version(); Do we need to keep trying if we get a zero value once? If not, this should be written as: static uint32_t programSDKVersion = dyld_get_program_sdk_version(); 277419 2016-04-26 16:03:43 -0700 2016-04-26 17:05:15 -0700 proposed patch. bug-157048.patch text/plain 2242 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjAwMTA5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE2LTA0LTI2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBV cGRhdGUgdGhlIGNvbXBhdGliaWxpdHkgdmVyc2lvbiBjaGVjayBmb3IgdGhlIE9iakMgQVBJJ3Mg SW5pdENvbnN0cnVjdG9yU3VwcG9ydCB0byB1c2UgZHlsZF9nZXRfcHJvZ3JhbV9zZGtfdmVyc2lv bigpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3 MDQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBB UEkvSlNXcmFwcGVyTWFwLm1tOgorICAgICAgICAoc3VwcG9ydHNJbml0TWV0aG9kQ29uc3RydWN0 b3JzKToKKyAgICAgICAgKGdldEpTRXhwb3J0UHJvdG9jb2wpOgorCiAyMDE2LTA0LTI2ICBTa2Fj aGtvdiBPbGVrc2FuZHIgIDxnc2thY2hrb3ZAZ21haWwuY29tPgogCiAgICAgICAgIGNhbGxpbmcg c3VwZXIoKSBhIHNlY29uZCB0aW1lIGluIGEgY29uc3RydWN0b3Igc2hvdWxkIHRocm93CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTV3JhcHBlck1hcC5tbQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTV3JhcHBlck1hcC5tbQkocmV2aXNpb24gMjAw MTAyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU1dyYXBwZXJNYXAubW0JKHdvcmtp bmcgY29weSkKQEAgLTQ0LDcgKzQ0LDE2IEBACiAKICNpbmNsdWRlIDxtYWNoLW8vZHlsZC5oPgog Ci1zdGF0aWMgY29uc3QgaW50MzJfdCB3ZWJraXRGaXJzdFZlcnNpb25XaXRoSW5pdENvbnN0cnVj dG9yU3VwcG9ydCA9IDB4MjFBMDQwMDsgLy8gNTM4LjQuMAorI2lmIF9faGFzX2luY2x1ZGUoPG1h Y2gtby9keWxkX3ByaXYuaD4pCisjaW5jbHVkZSA8bWFjaC1vL2R5bGRfcHJpdi5oPgorI2VuZGlm CitleHRlcm4gIkMiIHVpbnQzMl90IGR5bGRfZ2V0X3Byb2dyYW1fc2RrX3ZlcnNpb24oKTsKKwor I2lmIFBMQVRGT1JNKElPUykKK3N0YXRpYyBjb25zdCB1aW50MzJfdCB3ZWJraXRGaXJzdFNES1Zl cnNpb25XaXRoSW5pdENvbnN0cnVjdG9yU3VwcG9ydCA9IDB4ODAwMDA7IC8vIGlPUyA4LjAuMAor I2VsaWYgUExBVEZPUk0oTUFDKQorc3RhdGljIGNvbnN0IHVpbnQzMl90IHdlYmtpdEZpcnN0U0RL VmVyc2lvbldpdGhJbml0Q29uc3RydWN0b3JTdXBwb3J0ID0gMHhBMEEwMDsgLy8gT1NYIDEwLjEw LjAKKyNlbmRpZgogCiBAY2xhc3MgSlNPYmpDQ2xhc3NJbmZvOwogCkBAIC02NTAsMTIgKzY1OSwx MiBAQCBib29sIHN1cHBvcnRzSW5pdE1ldGhvZENvbnN0cnVjdG9ycygpCiAjaWYgUExBVEZPUk0o QVBQTEVUVikKICAgICAvLyBUaGVyZSBhcmUgbm8gb2xkIGNsaWVudHMgb24gQXBwbGUgVFYsIHNv IHRoZXJlJ3Mgbm8gbmVlZCBmb3IgYmFja3dhcmRzIGNvbXBhdGliaWxpdHkuCiAgICAgcmV0dXJu IHRydWU7CisjZWxzZQorICAgIHN0YXRpYyB1aW50MzJfdCBwcm9ncmFtU0RLVmVyc2lvbiA9IDA7 CisgICAgaWYgKCFwcm9ncmFtU0RLVmVyc2lvbikKKyAgICAgICAgcHJvZ3JhbVNES1ZlcnNpb24g PSBkeWxkX2dldF9wcm9ncmFtX3Nka192ZXJzaW9uKCk7CisgICAgcmV0dXJuIHByb2dyYW1TREtW ZXJzaW9uID49IHdlYmtpdEZpcnN0U0RLVmVyc2lvbldpdGhJbml0Q29uc3RydWN0b3JTdXBwb3J0 OwogI2VuZGlmCi0KLSAgICBzdGF0aWMgaW50MzJfdCB2ZXJzaW9uT2ZMaW5rVGltZUxpYnJhcnkg PSAwOwotICAgIGlmICghdmVyc2lvbk9mTGlua1RpbWVMaWJyYXJ5KQotICAgICAgICB2ZXJzaW9u T2ZMaW5rVGltZUxpYnJhcnkgPSBOU1ZlcnNpb25PZkxpbmtUaW1lTGlicmFyeSgiSmF2YVNjcmlw dENvcmUiKTsKLSAgICByZXR1cm4gdmVyc2lvbk9mTGlua1RpbWVMaWJyYXJ5ID49IHdlYmtpdEZp cnN0VmVyc2lvbldpdGhJbml0Q29uc3RydWN0b3JTdXBwb3J0OwogfQogCiBQcm90b2NvbCAqZ2V0 SlNFeHBvcnRQcm90b2NvbCgpCg==