177716 2017-10-01 02:11:54 -0700 Use WeakPtr for first-letter memory management 2017-10-20 23:29:31 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham commit-queue darin rniwa simon.fraser webkit-bug-importer zalan oldest_to_newest 1354986 0 koivisto 2017-10-01 02:11:54 -0700 Fix quirky memory management 1354987 1 322315 koivisto 2017-10-01 02:16:31 -0700 Created attachment 322315 patch 1354988 2 322316 koivisto 2017-10-01 02:23:18 -0700 Created attachment 322316 patch 1355066 3 322316 commit-queue 2017-10-01 14:25:00 -0700 Comment on attachment 322316 patch Clearing flags on attachment: 322316 Committed r222691: <http://trac.webkit.org/changeset/222691> 1355067 4 commit-queue 2017-10-01 14:25:01 -0700 All reviewed patches have been landed. Closing bug. 1355068 5 webkit-bug-importer 2017-10-01 14:25:50 -0700 <rdar://problem/34761348> 1363001 6 rniwa 2017-10-20 23:29:31 -0700 Looks like this was 1% regression on Speedometer 2's react test case: https://perf.webkit.org/v3/#/charts?since=1505283360823&zoom=(1506767770443.9912-1507709310260.7344)&paneList=((18-966-28983529-null-(5-2.5-500)))&repository=1 322315 2017-10-01 02:16:31 -0700 2017-10-01 02:23:18 -0700 patch first-letter-weakptr.patch text/plain 4260 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjY4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE3LTEwLTAxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgV2Vha1B0ciBmb3IgZmly c3QtbGV0dGVyIG1lbW9yeSBtYW5hZ2VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc3MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OmRlc3Ryb3lMZWZ0b3ZlckNoaWxkcmVuKToKKwor ICAgICAgICAgICAgUmVtb3ZlIGZpcnN0LWxldHRlciBzcGVjaWFsIGNhc2UuCisgICAgICAgICAg ICBVc2UgcmVtb3ZlQW5kRGVzdHJveUNoaWxkIGluc3RlYWQgb2YgY2FsbGluZyBkZXN0cm95KCkg ZGlyZWN0bHkuIFRoZSBsYXR0ZXIgc2hvdWxkCisgICAgICAgICAgICBldmVudHVhbGx5IHN0b3Ag Y2FsbGluZyB0YWtlQ2hpbGQgYW5kIGFzc2VydCB0aGF0IHRoZSByZW5kZXJlciBpcyBub3QgaW4g dGhlIHRyZWUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dEZyYWdtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRGcmFnbWVudDo6d2lsbEJlRGVzdHJveWVkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRGcmFnbWVudDo6c2V0VGV4dCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5oOgorCisgICAgICAgICAgICBVc2UgV2Vh a1B0ci4KKwogMjAxNy0wOS0zMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAog ICAgICAgICBEb24ndCByZXZlYWwgZmlsZSBVUkwgd2hlbiBwYXN0aW5nIGFuIGltYWdlCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCShyZXZpc2lvbiAy MjI2ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTUwMywxNyArNTAzLDkgQEAgdm9pZCBSZW5kZXJFbGVtZW50OjpyZW1v dmVBbmREZXN0cm95Q2hpbAogdm9pZCBSZW5kZXJFbGVtZW50OjpkZXN0cm95TGVmdG92ZXJDaGls ZHJlbigpCiB7CiAgICAgd2hpbGUgKG1fZmlyc3RDaGlsZCkgewotICAgICAgICBpZiAobV9maXJz dENoaWxkLT5zdHlsZSgpLnN0eWxlVHlwZSgpID09IEZJUlNUX0xFVFRFUiAmJiAhbV9maXJzdENo aWxkLT5pc1RleHQoKSkgewotICAgICAgICAgICAgLy8gRklYTUU6IE1lbW9yeSBtYW5hZ2VtZW50 LgotICAgICAgICAgICAgYXV0byBmaXJzdExldHRlciA9IHRha2VDaGlsZCgqbV9maXJzdENoaWxk KTsgLy8gOmZpcnN0LWxldHRlciBmcmFnbWVudCByZW5kZXJlcnMgYXJlIGRlc3Ryb3llZCBieSB0 aGVpciByZW1haW5pbmcgdGV4dCBmcmFnbWVudC4KLSAgICAgICAgICAgIGF1dG8qIGxlYWtlZFB0 ciA9IGZpcnN0TGV0dGVyLmxlYWtQdHIoKTsKLSAgICAgICAgICAgIFVOVVNFRF9QQVJBTShsZWFr ZWRQdHIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gRGVzdHJveSBhbnkgYW5v bnltb3VzIGNoaWxkcmVuIHJlbWFpbmluZyBpbiB0aGUgcmVuZGVyIHRyZWUsIGFzIHdlbGwgYXMg aW1wbGljaXQgKHNoYWRvdykgRE9NIGVsZW1lbnRzIGxpa2UgdGhvc2UgdXNlZCBpbiB0aGUgZW5n aW5lLWJhc2VkIHRleHQgZmllbGRzLgotICAgICAgICAgICAgaWYgKG1fZmlyc3RDaGlsZC0+bm9k ZSgpKQotICAgICAgICAgICAgICAgIG1fZmlyc3RDaGlsZC0+bm9kZSgpLT5zZXRSZW5kZXJlcihu dWxscHRyKTsKLSAgICAgICAgICAgIG1fZmlyc3RDaGlsZC0+ZGVzdHJveSgpOwotICAgICAgICB9 CisgICAgICAgIGlmIChtX2ZpcnN0Q2hpbGQtPm5vZGUoKSkKKyAgICAgICAgICAgIG1fZmlyc3RD aGlsZC0+bm9kZSgpLT5zZXRSZW5kZXJlcihudWxscHRyKTsKKyAgICAgICAgcmVtb3ZlQW5kRGVz dHJveUNoaWxkKCptX2ZpcnN0Q2hpbGQpOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAJKHJldmlzaW9uIDIyMjY4 NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC03NSw3ICs3NSw3IEBAIHZvaWQgUmVuZGVyVGV4dEZyYWdtZW50Ojpz dHlsZURpZENoYW5nZSgKIHZvaWQgUmVuZGVyVGV4dEZyYWdtZW50Ojp3aWxsQmVEZXN0cm95ZWQo KQogewogICAgIGlmIChtX2ZpcnN0TGV0dGVyKQotICAgICAgICBtX2ZpcnN0TGV0dGVyLT5kZXN0 cm95KCk7CisgICAgICAgIG1fZmlyc3RMZXR0ZXItPnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95 KCk7CiAgICAgUmVuZGVyVGV4dDo6d2lsbEJlRGVzdHJveWVkKCk7CiB9CiAKQEAgLTg3LDggKzg3 LDggQEAgdm9pZCBSZW5kZXJUZXh0RnJhZ21lbnQ6OnNldFRleHQoY29uc3QgUwogICAgIG1fZW5k ID0gdGV4dExlbmd0aCgpOwogICAgIGlmICghbV9maXJzdExldHRlcikKICAgICAgICAgcmV0dXJu OwotICAgIG1fZmlyc3RMZXR0ZXItPmRlc3Ryb3koKTsKLSAgICBtX2ZpcnN0TGV0dGVyID0gMDsK KyAgICBtX2ZpcnN0TGV0dGVyLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveSgpOworICAgIEFT U0VSVCghbV9maXJzdExldHRlcik7CiAgICAgaWYgKCF0ZXh0Tm9kZSgpKQogICAgICAgICByZXR1 cm47CiAgICAgQVNTRVJUKCF0ZXh0Tm9kZSgpLT5yZW5kZXJlcigpKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dEZyYWdtZW50LmgJKHJldmlzaW9uIDIyMjY4 NykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuaAkod29y a2luZyBjb3B5KQpAQCAtNDMsOCArNDMsOCBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgc3RhcnQo KSBjb25zdCB7IHJldHVybiBtX3N0YXJ0OyB9CiAgICAgdW5zaWduZWQgZW5kKCkgY29uc3QgeyBy ZXR1cm4gbV9lbmQ7IH0KIAotICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBmaXJzdExldHRlcigp IGNvbnN0IHsgcmV0dXJuIG1fZmlyc3RMZXR0ZXI7IH0KLSAgICB2b2lkIHNldEZpcnN0TGV0dGVy KFJlbmRlckJveE1vZGVsT2JqZWN0JiBmaXJzdExldHRlcikgeyBtX2ZpcnN0TGV0dGVyID0gJmZp cnN0TGV0dGVyOyB9CisgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIGZpcnN0TGV0dGVyKCkgY29u c3QgeyByZXR1cm4gbV9maXJzdExldHRlci5nZXQoKTsgfQorICAgIHZvaWQgc2V0Rmlyc3RMZXR0 ZXIoUmVuZGVyQm94TW9kZWxPYmplY3QmIGZpcnN0TGV0dGVyKSB7IG1fZmlyc3RMZXR0ZXIgPSBt YWtlV2Vha1B0cihmaXJzdExldHRlcik7IH0KICAgICAKICAgICBSZW5kZXJCbG9jayogYmxvY2tG b3JBY2NvbXBhbnlpbmdGaXJzdExldHRlcigpOwogCkBAIC02OCw3ICs2OCw3IEBAIHByaXZhdGU6 CiAgICAgLy8gQWx0ZXJuYXRpdmUgZGVzY3JpcHRpb24gdGhhdCBjYW4gYmUgdXNlZCBmb3IgYWNj ZXNzaWJpbGl0eSBpbnN0ZWFkIG9mIHRoZSBuYXRpdmUgdGV4dC4KICAgICBTdHJpbmcgbV9hbHRU ZXh0OwogICAgIFN0cmluZyBtX2NvbnRlbnRTdHJpbmc7Ci0gICAgUmVuZGVyQm94TW9kZWxPYmpl Y3QqIG1fZmlyc3RMZXR0ZXI7CisgICAgV2Vha1B0cjxSZW5kZXJCb3hNb2RlbE9iamVjdD4gbV9m aXJzdExldHRlcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 322316 2017-10-01 02:23:18 -0700 2017-10-01 14:25:00 -0700 patch first-letter-weakptr-2.patch text/plain 4257 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyMjY4OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE3LTEwLTAxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgV2Vha1B0ciBmb3IgZmly c3QtbGV0dGVyIG1lbW9yeSBtYW5hZ2VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzc3MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckVsZW1lbnQ6OmRlc3Ryb3lMZWZ0b3ZlckNoaWxkcmVuKToKKwor ICAgICAgICAgICAgUmVtb3ZlIGZpcnN0LWxldHRlciBzcGVjaWFsIGNhc2UuCisgICAgICAgICAg ICBVc2UgcmVtb3ZlQW5kRGVzdHJveUNoaWxkIGluc3RlYWQgb2YgY2FsbGluZyBkZXN0cm95KCkg ZGlyZWN0bHkuIFRoZSBsYXR0ZXIgc2hvdWxkCisgICAgICAgICAgICBldmVudHVhbGx5IHN0b3Ag Y2FsbGluZyB0YWtlQ2hpbGQgYW5kIGFzc2VydCB0aGF0IHRoZSByZW5kZXJlciBpcyBub3QgaW4g dGhlIHRyZWUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dEZyYWdtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRGcmFnbWVudDo6d2lsbEJlRGVzdHJveWVkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRGcmFnbWVudDo6c2V0VGV4dCk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5oOgorCisgICAgICAgICAgICBVc2UgV2Vh a1B0ci4KKwogMjAxNy0wOS0zMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAog ICAgICAgICBEb24ndCByZXZlYWwgZmlsZSBVUkwgd2hlbiBwYXN0aW5nIGFuIGltYWdlCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCShyZXZpc2lvbiAy MjI2ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTUwMywxNyArNTAzLDkgQEAgdm9pZCBSZW5kZXJFbGVtZW50OjpyZW1v dmVBbmREZXN0cm95Q2hpbAogdm9pZCBSZW5kZXJFbGVtZW50OjpkZXN0cm95TGVmdG92ZXJDaGls ZHJlbigpCiB7CiAgICAgd2hpbGUgKG1fZmlyc3RDaGlsZCkgewotICAgICAgICBpZiAobV9maXJz dENoaWxkLT5zdHlsZSgpLnN0eWxlVHlwZSgpID09IEZJUlNUX0xFVFRFUiAmJiAhbV9maXJzdENo aWxkLT5pc1RleHQoKSkgewotICAgICAgICAgICAgLy8gRklYTUU6IE1lbW9yeSBtYW5hZ2VtZW50 LgotICAgICAgICAgICAgYXV0byBmaXJzdExldHRlciA9IHRha2VDaGlsZCgqbV9maXJzdENoaWxk KTsgLy8gOmZpcnN0LWxldHRlciBmcmFnbWVudCByZW5kZXJlcnMgYXJlIGRlc3Ryb3llZCBieSB0 aGVpciByZW1haW5pbmcgdGV4dCBmcmFnbWVudC4KLSAgICAgICAgICAgIGF1dG8qIGxlYWtlZFB0 ciA9IGZpcnN0TGV0dGVyLmxlYWtQdHIoKTsKLSAgICAgICAgICAgIFVOVVNFRF9QQVJBTShsZWFr ZWRQdHIpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgLy8gRGVzdHJveSBhbnkgYW5v bnltb3VzIGNoaWxkcmVuIHJlbWFpbmluZyBpbiB0aGUgcmVuZGVyIHRyZWUsIGFzIHdlbGwgYXMg aW1wbGljaXQgKHNoYWRvdykgRE9NIGVsZW1lbnRzIGxpa2UgdGhvc2UgdXNlZCBpbiB0aGUgZW5n aW5lLWJhc2VkIHRleHQgZmllbGRzLgotICAgICAgICAgICAgaWYgKG1fZmlyc3RDaGlsZC0+bm9k ZSgpKQotICAgICAgICAgICAgICAgIG1fZmlyc3RDaGlsZC0+bm9kZSgpLT5zZXRSZW5kZXJlcihu dWxscHRyKTsKLSAgICAgICAgICAgIG1fZmlyc3RDaGlsZC0+ZGVzdHJveSgpOwotICAgICAgICB9 CisgICAgICAgIGlmIChhdXRvKiBub2RlID0gbV9maXJzdENoaWxkLT5ub2RlKCkpCisgICAgICAg ICAgICBub2RlLT5zZXRSZW5kZXJlcihudWxscHRyKTsKKyAgICAgICAgcmVtb3ZlQW5kRGVzdHJv eUNoaWxkKCptX2ZpcnN0Q2hpbGQpOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRGcmFnbWVudC5jcHAJKHJldmlzaW9uIDIyMjY4NykK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03NSw3ICs3NSw3IEBAIHZvaWQgUmVuZGVyVGV4dEZyYWdtZW50OjpzdHls ZURpZENoYW5nZSgKIHZvaWQgUmVuZGVyVGV4dEZyYWdtZW50Ojp3aWxsQmVEZXN0cm95ZWQoKQog ewogICAgIGlmIChtX2ZpcnN0TGV0dGVyKQotICAgICAgICBtX2ZpcnN0TGV0dGVyLT5kZXN0cm95 KCk7CisgICAgICAgIG1fZmlyc3RMZXR0ZXItPnJlbW92ZUZyb21QYXJlbnRBbmREZXN0cm95KCk7 CiAgICAgUmVuZGVyVGV4dDo6d2lsbEJlRGVzdHJveWVkKCk7CiB9CiAKQEAgLTg3LDggKzg3LDgg QEAgdm9pZCBSZW5kZXJUZXh0RnJhZ21lbnQ6OnNldFRleHQoY29uc3QgUwogICAgIG1fZW5kID0g dGV4dExlbmd0aCgpOwogICAgIGlmICghbV9maXJzdExldHRlcikKICAgICAgICAgcmV0dXJuOwot ICAgIG1fZmlyc3RMZXR0ZXItPmRlc3Ryb3koKTsKLSAgICBtX2ZpcnN0TGV0dGVyID0gMDsKKyAg ICBtX2ZpcnN0TGV0dGVyLT5yZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveSgpOworICAgIEFTU0VS VCghbV9maXJzdExldHRlcik7CiAgICAgaWYgKCF0ZXh0Tm9kZSgpKQogICAgICAgICByZXR1cm47 CiAgICAgQVNTRVJUKCF0ZXh0Tm9kZSgpLT5yZW5kZXJlcigpKTsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dEZyYWdtZW50LmgJKHJldmlzaW9uIDIyMjY4NykK KysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0RnJhZ21lbnQuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDMsOCArNDMsOCBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgc3RhcnQoKSBj b25zdCB7IHJldHVybiBtX3N0YXJ0OyB9CiAgICAgdW5zaWduZWQgZW5kKCkgY29uc3QgeyByZXR1 cm4gbV9lbmQ7IH0KIAotICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBmaXJzdExldHRlcigpIGNv bnN0IHsgcmV0dXJuIG1fZmlyc3RMZXR0ZXI7IH0KLSAgICB2b2lkIHNldEZpcnN0TGV0dGVyKFJl bmRlckJveE1vZGVsT2JqZWN0JiBmaXJzdExldHRlcikgeyBtX2ZpcnN0TGV0dGVyID0gJmZpcnN0 TGV0dGVyOyB9CisgICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIGZpcnN0TGV0dGVyKCkgY29uc3Qg eyByZXR1cm4gbV9maXJzdExldHRlci5nZXQoKTsgfQorICAgIHZvaWQgc2V0Rmlyc3RMZXR0ZXIo UmVuZGVyQm94TW9kZWxPYmplY3QmIGZpcnN0TGV0dGVyKSB7IG1fZmlyc3RMZXR0ZXIgPSBtYWtl V2Vha1B0cihmaXJzdExldHRlcik7IH0KICAgICAKICAgICBSZW5kZXJCbG9jayogYmxvY2tGb3JB Y2NvbXBhbnlpbmdGaXJzdExldHRlcigpOwogCkBAIC02OCw3ICs2OCw3IEBAIHByaXZhdGU6CiAg ICAgLy8gQWx0ZXJuYXRpdmUgZGVzY3JpcHRpb24gdGhhdCBjYW4gYmUgdXNlZCBmb3IgYWNjZXNz aWJpbGl0eSBpbnN0ZWFkIG9mIHRoZSBuYXRpdmUgdGV4dC4KICAgICBTdHJpbmcgbV9hbHRUZXh0 OwogICAgIFN0cmluZyBtX2NvbnRlbnRTdHJpbmc7Ci0gICAgUmVuZGVyQm94TW9kZWxPYmplY3Qq IG1fZmlyc3RMZXR0ZXI7CisgICAgV2Vha1B0cjxSZW5kZXJCb3hNb2RlbE9iamVjdD4gbV9maXJz dExldHRlcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK