190878 2018-10-24 10:14:19 -0700 Add BPLATFORM(IOS_FAMILY) 2018-10-24 14:02:53 -0700 1 1 1 Unclassified WebKit bmalloc Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap fpizlo ggaren saam thorton webkit-bug-importer oldest_to_newest 1471864 0 ap 2018-10-24 10:14:19 -0700 Just like in WTF, BPLATFORM(IOS) is a misnomer. Change that to strictly match iOS, and add BPLATFORM(IOS_FAMILY). 1471866 1 353038 ap 2018-10-24 10:19:03 -0700 Created attachment 353038 proposed patch Mostly mechanical. It may be worth verifying if BUSE_CHECK_NANO_MALLOC and GIGACAGE_ENABLED are defined correctly. I believe that I kept the behavior unchanged, but it's surprising that gigacage is only enabled on iOS proper. #if ((BOS(DARWIN) || BOS(LINUX)) && \ - (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) && (!BPLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300)))) + (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) && (!BPLATFORM(IOS_FAMILY) || BPLATFORM(IOS))))) #define GIGACAGE_ENABLED 1 1471917 2 353038 saam 2018-10-24 13:09:11 -0700 Comment on attachment 353038 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=353038&action=review r=me > Source/bmalloc/bmalloc/BPlatform.h:-241 > -#if ((BPLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (BPLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 50000) || (BPLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 120000)) \ Do we not care about building for iOS 11 anymore? I have no use for this, but does our perf infrastructure care? 1471918 3 saam 2018-10-24 13:09:28 -0700 (In reply to Alexey Proskuryakov from comment #1) > Created attachment 353038 [details] > proposed patch > > Mostly mechanical. It may be worth verifying if BUSE_CHECK_NANO_MALLOC and > GIGACAGE_ENABLED are defined correctly. I believe that I kept the behavior > unchanged, but it's surprising that gigacage is only enabled on iOS proper. > > #if ((BOS(DARWIN) || BOS(LINUX)) && \ > - (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) && > (!BPLATFORM(IOS) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300)))) > + (BCPU(X86_64) || (BCPU(ARM64) && !defined(__ILP32__) && > (!BPLATFORM(IOS_FAMILY) || BPLATFORM(IOS))))) > #define GIGACAGE_ENABLED 1 They look correct to me 1471919 4 353038 saam 2018-10-24 13:14:52 -0700 Comment on attachment 353038 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=353038&action=review > Source/bmalloc/bmalloc/BPlatform.h:56 > +#if TARGET_OS_IOS This is true for iPhone/iPad? 1471927 5 ap 2018-10-24 13:59:13 -0700 > Do we not care about building for iOS 11 anymore? I have no use for this, but does our perf infrastructure care? No, iOS 11 build is not longer supported by trunk. I'll be cleaning up more of the checks for older OS versions next. > > +#if TARGET_OS_IOS > > This is true for iPhone/iPad? Yes, these and only these (plus simulators of course). 1471928 6 ap 2018-10-24 14:01:39 -0700 Committed http://trac.webkit.org/r237399 1471930 7 webkit-bug-importer 2018-10-24 14:02:53 -0700 <rdar://problem/45532352> 353038 2018-10-24 10:19:03 -0700 2018-10-24 13:09:11 -0700 proposed patch bmalloc.txt text/plain 8195 ap SW5kZXg6IFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1h bGxvYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzNzM4OCkKKysrIFNvdXJjZS9ibWFsbG9jL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTEwLTI0ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBCUExBVEZPUk0oSU9T X0ZBTUlMWSkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MDg3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogYm1hbGxvYy9BdmFpbGFibGVNZW1vcnkuY3BwOgorICAgICAgICAoYm1hbGxvYzo6bWVtb3J5 U2l6ZUFjY29yZGluZ1RvS2VybmVsKToKKyAgICAgICAgKGJtYWxsb2M6OmNvbXB1dGVBdmFpbGFi bGVNZW1vcnkpOgorICAgICAgICAqIGJtYWxsb2MvQXZhaWxhYmxlTWVtb3J5Lmg6CisgICAgICAg IChibWFsbG9jOjppc1VuZGVyTWVtb3J5UHJlc3N1cmUpOgorICAgICAgICAqIGJtYWxsb2MvQlBs YXRmb3JtLmg6CisgICAgICAgICogYm1hbGxvYy9HaWdhY2FnZS5oOgorICAgICAgICAqIGJtYWxs b2MvTG9nZ2luZy5jcHA6CisgICAgICAgIChibWFsbG9jOjpsb2dWTUZhaWx1cmUpOgorICAgICAg ICAqIGJtYWxsb2MvVk1BbGxvY2F0ZS5oOgorICAgICAgICAoYm1hbGxvYzo6dm1QYWdlU2l6ZVBo eXNpY2FsKToKKyAgICAgICAgKiBibWFsbG9jL2JtYWxsb2MuaDoKKyAgICAgICAgKiBibWFsbG9j L2Rhcndpbi9NZW1vcnlTdGF0dXNTUEkuaDoKKwogMjAxOC0xMC0xMiAgUnlhbiBIYWRkYWQgIDxy eWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCBy MjM3MDYzLgpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BdmFpbGFibGVNZW1vcnkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQXZhaWxhYmxlTWVtb3J5LmNw cAkocmV2aXNpb24gMjM3MzYwKQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9BdmFpbGFibGVN ZW1vcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAiQXZh aWxhYmxlTWVtb3J5LmgiCiAKICNpbmNsdWRlICJFbnZpcm9ubWVudC5oIgotI2lmIEJQTEFURk9S TShJT1MpCisjaWYgQlBMQVRGT1JNKElPU19GQU1JTFkpCiAjaW5jbHVkZSAiTWVtb3J5U3RhdHVz U1BJLmgiCiAjZW5kaWYKICNpbmNsdWRlICJQZXJQcm9jZXNzLmgiCkBAIC0zNCw3ICszNCw3IEBA CiAjaW5jbHVkZSAiU2l6ZXMuaCIKICNpbmNsdWRlIDxtdXRleD4KICNpZiBCT1MoREFSV0lOKQot I2lmIEJQTEFURk9STShJT1MpCisjaWYgQlBMQVRGT1JNKElPU19GQU1JTFkpCiAjaW1wb3J0IDxh bGdvcml0aG0+CiAjZW5kaWYKICNpbXBvcnQgPGRpc3BhdGNoL2Rpc3BhdGNoLmg+CkBAIC01Myw3 ICs1Myw3IEBAIHN0YXRpYyBjb25zdCBzaXplX3QgYXZhaWxhYmxlTWVtb3J5R3Vlc3MKICNpZiBC T1MoREFSV0lOKQogc3RhdGljIHNpemVfdCBtZW1vcnlTaXplQWNjb3JkaW5nVG9LZXJuZWwoKQog ewotI2lmIEJQTEFURk9STShJT1NfU0lNVUxBVE9SKQorI2lmIEJQTEFURk9STShJT1NfRkFNSUxZ X1NJTVVMQVRPUikKICAgICBCVU5VU0VEX1BBUkFNKGF2YWlsYWJsZU1lbW9yeUd1ZXNzKTsKICAg ICAvLyBQcmV0ZW5kIHdlIGhhdmUgMTAyNE1CIG9mIG1lbW9yeSB0byBtYWtlIGNhY2hlIHNpemVz IGJlaGF2ZSBsaWtlIG9uIGRldmljZS4KICAgICByZXR1cm4gMTAyNCAqIGJtYWxsb2M6Ok1COwpA QCAtNzUsNyArNzUsNyBAQCBzdGF0aWMgc2l6ZV90IG1lbW9yeVNpemVBY2NvcmRpbmdUb0tlcm5l CiB9CiAjZW5kaWYKIAotI2lmIEJQTEFURk9STShJT1MpCisjaWYgQlBMQVRGT1JNKElPU19GQU1J TFkpCiBzdGF0aWMgc2l6ZV90IGpldHNhbUxpbWl0KCkKIHsKICAgICBtZW1vcnlzdGF0dXNfbWVt bGltaXRfcHJvcGVydGllc190IHByb3BlcnRpZXM7CkBAIC05Miw3ICs5Miw3IEBAIHN0YXRpYyBz aXplX3QgY29tcHV0ZUF2YWlsYWJsZU1lbW9yeSgpCiB7CiAjaWYgQk9TKERBUldJTikKICAgICBz aXplX3Qgc2l6ZUFjY29yZGluZ1RvS2VybmVsID0gbWVtb3J5U2l6ZUFjY29yZGluZ1RvS2VybmVs KCk7Ci0jaWYgQlBMQVRGT1JNKElPUykKKyNpZiBCUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBz aXplQWNjb3JkaW5nVG9LZXJuZWwgPSBzdGQ6Om1pbihzaXplQWNjb3JkaW5nVG9LZXJuZWwsIGpl dHNhbUxpbWl0KCkpOwogI2VuZGlmCiAgICAgc2l6ZV90IG11bHRpcGxlID0gMTI4ICogYm1hbGxv Yzo6TUI7CkBAIC0xMjEsNyArMTIxLDcgQEAgc2l6ZV90IGF2YWlsYWJsZU1lbW9yeSgpCiAgICAg cmV0dXJuIGF2YWlsYWJsZU1lbW9yeTsKIH0KIAotI2lmIEJQTEFURk9STShJT1MpCisjaWYgQlBM QVRGT1JNKElPU19GQU1JTFkpCiBNZW1vcnlTdGF0dXMgbWVtb3J5U3RhdHVzKCkKIHsKICAgICB0 YXNrX3ZtX2luZm9fZGF0YV90IHZtSW5mbzsKSW5kZXg6IFNvdXJjZS9ibWFsbG9jL2JtYWxsb2Mv QXZhaWxhYmxlTWVtb3J5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9B dmFpbGFibGVNZW1vcnkuaAkocmV2aXNpb24gMjM3MzYwKQorKysgU291cmNlL2JtYWxsb2MvYm1h bGxvYy9BdmFpbGFibGVNZW1vcnkuaAkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNyBAQCBu YW1lc3BhY2UgYm1hbGxvYyB7CiAKIHNpemVfdCBhdmFpbGFibGVNZW1vcnkoKTsKIAotI2lmIEJQ TEFURk9STShJT1MpCisjaWYgQlBMQVRGT1JNKElPU19GQU1JTFkpCiBzdHJ1Y3QgTWVtb3J5U3Rh dHVzIHsKICAgICBNZW1vcnlTdGF0dXMoc2l6ZV90IG1lbW9yeUZvb3RwcmludCwgZG91YmxlIHBl cmNlbnRBdmFpbGFibGVNZW1vcnlJblVzZSkKICAgICAgICAgOiBtZW1vcnlGb290cHJpbnQobWVt b3J5Rm9vdHByaW50KQpAQCAtNjEsNyArNjEsNyBAQCBpbmxpbmUgZG91YmxlIHBlcmNlbnRBdmFp bGFibGVNZW1vcnlJblVzCiAKIGlubGluZSBib29sIGlzVW5kZXJNZW1vcnlQcmVzc3VyZSgpCiB7 Ci0jaWYgQlBMQVRGT1JNKElPUykKKyNpZiBCUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICByZXR1 cm4gcGVyY2VudEF2YWlsYWJsZU1lbW9yeUluVXNlKCkgPiBtZW1vcnlQcmVzc3VyZVRocmVzaG9s ZDsKICNlbHNlCiAgICAgcmV0dXJuIGZhbHNlOwpJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxv Yy9CUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0JQbGF0 Zm9ybS5oCShyZXZpc2lvbiAyMzczNjApCisrKyBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0JQbGF0 Zm9ybS5oCSh3b3JraW5nIGNvcHkpCkBAIC01MywxNyArNTMsMjMgQEAKICNlbmRpZgogCiAjaWYg Qk9TKERBUldJTikgJiYgIWRlZmluZWQoQlVJTERJTkdfV0lUSF9DTUFLRSkKLSNpZiBUQVJHRVRf T1NfSVBIT05FCisjaWYgVEFSR0VUX09TX0lPUwogI2RlZmluZSBCUExBVEZPUk1fSU9TIDEKICNp ZiBUQVJHRVRfT1NfU0lNVUxBVE9SCiAjZGVmaW5lIEJQTEFURk9STV9JT1NfU0lNVUxBVE9SIDEK ICNlbmRpZgorI2VuZGlmCisjaWYgVEFSR0VUX09TX0lQSE9ORQorI2RlZmluZSBCUExBVEZPUk1f SU9TX0ZBTUlMWSAxCisjaWYgVEFSR0VUX09TX1NJTVVMQVRPUgorI2RlZmluZSBCUExBVEZPUk1f SU9TX0ZBTUlMWV9TSU1VTEFUT1IgMQorI2VuZGlmCiAjZWxpZiBUQVJHRVRfT1NfTUFDCiAjZGVm aW5lIEJQTEFURk9STV9NQUMgMQogI2VuZGlmCiAjZW5kaWYKIAotI2lmIEJQTEFURk9STShNQUMp IHx8IEJQTEFURk9STShJT1MpCisjaWYgQlBMQVRGT1JNKE1BQykgfHwgQlBMQVRGT1JNKElPU19G QU1JTFkpCiAjZGVmaW5lIEJQTEFURk9STV9DT0NPQSAxCiAjZW5kaWYKIApAQCAtMjIyLDExICsy MjgsMTEgQEAKIAogI2RlZmluZSBCQVRUUklCVVRFX1BSSU5URihmb3JtYXRTdHJpbmdBcmd1bWVu dCwgZXh0cmFBcmd1bWVudHMpIF9fYXR0cmlidXRlX18oKF9fZm9ybWF0X18ocHJpbnRmLCBmb3Jt YXRTdHJpbmdBcmd1bWVudCwgZXh0cmFBcmd1bWVudHMpKSkKIAotI2lmIChCUExBVEZPUk0oTUFD KSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTIwMCkgfHwgQlBMQVRG T1JNKElPUykKKyNpZiBCUExBVEZPUk0oTUFDKSB8fCBCUExBVEZPUk0oSU9TX0ZBTUlMWSkKICNk ZWZpbmUgQlVTRV9PU19MT0cgMQogI2VuZGlmCiAKLSNpZiAhZGVmaW5lZChCVVNFX0VYUE9SVF9N QUNST1MpICYmIChCUExBVEZPUk0oTUFDKSB8fCBCUExBVEZPUk0oSU9TKSkKKyNpZiAhZGVmaW5l ZChCVVNFX0VYUE9SVF9NQUNST1MpICYmIChCUExBVEZPUk0oTUFDKSB8fCBCUExBVEZPUk0oSU9T X0ZBTUlMWSkpCiAjZGVmaW5lIEJVU0VfRVhQT1JUX01BQ1JPUyAxCiAjZW5kaWYKIApAQCAtMjM4 LDggKzI0NCw3IEBACiAvKiBUaGlzIGlzIHVzZWQgZm9yIGRlYnVnZ2luZyB3aGVuIGhhY2tpbmcg b24gaG93IGJtYWxsb2MgY2FsY3VsYXRlcyBpdHMgcGh5c2ljYWwgZm9vdHByaW50LiAqLwogI2Rl ZmluZSBFTkFCTEVfUEhZU0lDQUxfUEFHRV9NQVAgMAogCi0jaWYgKChCUExBVEZPUk0oSU9TKSAm JiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMjAwMDApIHx8IChCUExBVEZP Uk0oV0FUQ0hPUykgJiYgX19XQVRDSF9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSA1MDAwMCkg fHwgKEJQTEFURk9STShBUFBMRVRWKSAmJiBfX1RWX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDEyMDAwMCkpIFwKLSAgICAmJiAoQkNQVShBUk02NCkgfHwgQkNQVShBUk0pKQorI2lmIEJQTEFU Rk9STShJT1NfRkFNSUxZKSAmJiAoQkNQVShBUk02NCkgfHwgQkNQVShBUk0pKQogI2RlZmluZSBC VVNFX0NIRUNLX05BTk9fTUFMTE9DIDEKICNlbHNlCiAjZGVmaW5lIEJVU0VfQ0hFQ0tfTkFOT19N QUxMT0MgMApJbmRleDogU291cmNlL2JtYWxsb2MvYm1hbGxvYy9HaWdhY2FnZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvR2lnYWNhZ2UuaAkocmV2aXNpb24gMjM3MzYw KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9HaWdhY2FnZS5oCSh3b3JraW5nIGNvcHkpCkBA IC01OSw3ICs1OSw3IEBAIHN0YXRpY19hc3NlcnQoYm1hbGxvYzo6aXNQb3dlck9mVHdvKEpTVkEK ICNkZWZpbmUgSlNWQUxVRV9HSUdBQ0FHRV9NQVNLIEdJR0FDQUdFX1NJWkVfVE9fTUFTSyhKU1ZB TFVFX0dJR0FDQUdFX1NJWkUpCiAKICNpZiAoKEJPUyhEQVJXSU4pIHx8IEJPUyhMSU5VWCkpICYm IFwKLSAgICAoQkNQVShYODZfNjQpIHx8IChCQ1BVKEFSTTY0KSAmJiAhZGVmaW5lZChfX0lMUDMy X18pICYmICghQlBMQVRGT1JNKElPUykgfHwgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTEwMzAwKSkpKQorICAgIChCQ1BVKFg4Nl82NCkgfHwgKEJDUFUoQVJNNjQpICYmICFk ZWZpbmVkKF9fSUxQMzJfXykgJiYgKCFCUExBVEZPUk0oSU9TX0ZBTUlMWSkgfHwgQlBMQVRGT1JN KElPUykpKSkpCiAjZGVmaW5lIEdJR0FDQUdFX0VOQUJMRUQgMQogI2Vsc2UKICNkZWZpbmUgR0lH QUNBR0VfRU5BQkxFRCAwCkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0xvZ2dpbmcuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvTG9nZ2luZy5jcHAJKHJldmlz aW9uIDIzNzM2MCkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvTG9nZ2luZy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMxLDcgKzMxLDcgQEAKICNpbmNsdWRlIDxzdGRpby5oPgogI2VuZGlmCiAK LSNpZiBCUExBVEZPUk0oSU9TKQorI2lmIEJQTEFURk9STShJT1NfRkFNSUxZKQogI2luY2x1ZGUg PENvcmVGb3VuZGF0aW9uL0NvcmVGb3VuZGF0aW9uLmg+CiAjaW5jbHVkZSA8bWFjaC9leGNlcHRp b25fdHlwZXMuaD4KICNpbmNsdWRlIDxvYmpjL29iamMuaD4KQEAgLTQ2LDcgKzQ2LDcgQEAgbmFt ZXNwYWNlIGJtYWxsb2MgewogCiB2b2lkIGxvZ1ZNRmFpbHVyZShzaXplX3Qgdm1TaXplKQogewot I2lmIEJQTEFURk9STShJT1MpCisjaWYgQlBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgY29uc3Qg bWFjaF9leGNlcHRpb25fZGF0YV90eXBlX3Qga0V4Y2VwdGlvbkNvZGUgPSAweGMxMDVjYTExOwog ICAgIENGU3RyaW5nUmVmIGRlc2NyaXB0aW9uID0gQ0ZTdHJpbmdDcmVhdGVXaXRoRm9ybWF0KGtD RkFsbG9jYXRvckRlZmF1bHQsIG51bGxwdHIsIENGU1RSKCJibWFsbG9jIGZhaWxlZCB0byBtbWFw ICVsdSBieXRlcyIpLCB2bVNpemUpOwogICAgIFNpbXVsYXRlQ3Jhc2goZ2V0cGlkKCksIGtFeGNl cHRpb25Db2RlLCBkZXNjcmlwdGlvbik7CkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1ZN QWxsb2NhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL1ZNQWxsb2Nh dGUuaAkocmV2aXNpb24gMjM3MzYwKQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9WTUFsbG9j YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTk2LDcgKzk2LDcgQEAgaW5saW5lIHZvaWQgdm1WYWxp ZGF0ZSh2b2lkKiBwLCBzaXplX3QgdgogCiBpbmxpbmUgc2l6ZV90IHZtUGFnZVNpemVQaHlzaWNh bCgpCiB7Ci0jaWYgQlBMQVRGT1JNKElPUykKKyNpZiBCUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAg ICByZXR1cm4gdm1fa2VybmVsX3BhZ2Vfc2l6ZTsKICNlbHNlCiAgICAgc3RhdGljIHNpemVfdCBj YWNoZWQ7CkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL2JtYWxsb2MuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL2JtYWxsb2MuaAkocmV2aXNpb24gMjM3MzYwKQor KysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9ibWFsbG9jLmgJKHdvcmtpbmcgY29weSkKQEAgLTEw NSw3ICsxMDUsNyBAQCBpbmxpbmUgc2l6ZV90IGF2YWlsYWJsZU1lbW9yeSgpCiAgICAgcmV0dXJu IGJtYWxsb2M6OmF2YWlsYWJsZU1lbW9yeSgpOwogfQogICAgIAotI2lmIEJQTEFURk9STShJT1Mp CisjaWYgQlBMQVRGT1JNKElPU19GQU1JTFkpCiBpbmxpbmUgc2l6ZV90IG1lbW9yeUZvb3Rwcmlu dCgpCiB7CiAgICAgcmV0dXJuIGJtYWxsb2M6Om1lbW9yeUZvb3RwcmludCgpOwpJbmRleDogU291 cmNlL2JtYWxsb2MvYm1hbGxvYy9kYXJ3aW4vTWVtb3J5U3RhdHVzU1BJLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL2JtYWxsb2MvYm1hbGxvYy9kYXJ3aW4vTWVtb3J5U3RhdHVzU1BJLmgJKHJldmlz aW9uIDIzNzM2MCkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvZGFyd2luL01lbW9yeVN0YXR1 c1NQSS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw3ICsyNiw3IEBACiAKICNpbmNsdWRlICJCUGxh dGZvcm0uaCIKIAotI2lmIEJQTEFURk9STShJT1MpCisjaWYgQlBMQVRGT1JNKElPU19GQU1JTFkp CiAKICNpZiBfX2hhc19pbmNsdWRlKDxTeXN0ZW0vc3lzL2tlcm5fbWVtb3J5c3RhdHVzLmg+KQog ZXh0ZXJuICJDIiB7CkBAIC01MSw0ICs1MSw0IEBAIGV4dGVybiAiQyIgewogaW50IG1lbW9yeXN0 YXR1c19jb250cm9sKHVpbnQzMl90IGNvbW1hbmQsIGludDMyX3QgcGlkLCB1aW50MzJfdCBmbGFn cywgdm9pZCAqYnVmZmVyLCBzaXplX3QgYnVmZmVyc2l6ZSk7CiB9CiAKLSNlbmRpZiAvLyBCUExB VEZPUk0oSU9TKQorI2VuZGlmIC8vIEJQTEFURk9STShJT1NfRkFNSUxZKQo=