145213 2015-05-20 10:46:17 -0700 Eden collections should extend the IncrementalSweeper work list, not replace it. 2015-05-20 13:30:54 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Performance P2 Normal --- 1 kling kling commit-queue ggaren mhahnenb oldest_to_newest 1096286 0 kling 2015-05-20 10:46:17 -0700 <rdar://problem/21002666> 1096289 1 253447 kling 2015-05-20 11:00:43 -0700 Created attachment 253447 Patch 1096292 2 253449 kling 2015-05-20 11:07:20 -0700 Created attachment 253449 Patch 1096297 3 253449 ggaren 2015-05-20 11:13:42 -0700 Comment on attachment 253449 Patch r=me 1096301 4 ggaren 2015-05-20 11:22:38 -0700 It's strange that a bug in the incremental sweeper could cause runaway memory use. By design, each new object allocated should sweep an old object freed. The incremental sweeper is supposed to be an optimization, not an essential way to avoid runaway memory use. 1096333 5 253449 commit-queue 2015-05-20 13:30:51 -0700 Comment on attachment 253449 Patch Clearing flags on attachment: 253449 Committed r184652: <http://trac.webkit.org/changeset/184652> 1096334 6 commit-queue 2015-05-20 13:30:54 -0700 All reviewed patches have been landed. Closing bug. 253447 2015-05-20 11:00:43 -0700 2015-05-20 11:04:42 -0700 Patch bug-145213.diff text/plain 5665 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGZkODMzMDIuLmY3NzM3ZTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE1LTA1LTIwICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBFZGVuIGNvbGxlY3Rpb25zIHNob3VsZCBl eHRlbmQgdGhlIEluY3JlbWVudGFsU3dlZXBlciB3b3JrIGxpc3QsIG5vdCByZXBsYWNlIGl0Lgor ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTQ1MjEzPgorICAgICAgICA8cmRhcjovL3By b2JsZW0vMjEwMDI2NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWZ0ZXIgYW4gZWRlbiBjb2xsZWN0aW9uLCB0aGUgZ2FyYmFnZSBjb2xsZWN0b3Ig d2FzIGFkZGluZyBhbGwgTWFya2VkQmxvY2tzIGNvbnRhaW5pbmcKKyAgICAgICAgbmV3IG9iamVj dHMgdG8gdGhlIEluY3JlbWVudGFsU3dlZXBlcidzIHdvcmsgbGlzdCwgdG8gbWFrZSBzdXJlIHRo ZXkgZGlkbid0IGhhdmUgdG8KKyAgICAgICAgd2FpdCB1bnRpbCB0aGUgbmV4dCBmdWxsIGNvbGxl Y3Rpb24gYmVmb3JlIGdldHRpbmcgc3dlcHQuCisKKyAgICAgICAgT3IgYXQgbGVhc3QsIHRoYXQn cyB3aGF0IGl0IHRob3VnaHQgaXQgd2FzIGRvaW5nLiBJdCB0dXJucyBvdXQgdGhhdCBJbmNyZW1l bnRhbFN3ZWVwZXIncworICAgICAgICBpbnRlcm5hbCB3b3JrIGxpc3QgaXMgcmVhbGx5IGp1c3Qg YSByZWZlcmVuY2UgdG8gSGVhcDo6bV9ibG9ja1NuYXBzaG90LiBJIGRpZG4ndCByZWFsaXplCisg ICAgICAgIHRoaXMgd2hlbiB3cml0aW5nIHRoZSBwb3N0LWVkZW4gc3dlZXAgY29kZSwgYW5kIGlu c3RlYWQgbWFkZSBlZGVuIGNvbGxlY3Rpb25zIGNhbmNlbAorICAgICAgICBhbGwgcGVuZGluZyBz d2VlcHMgYW5kICpyZXBsYWNlKiB0aGVtIHdpdGggdGhlIGxpc3Qgb2YgYmxvY2tzIHdpdGggbmV3 IG9iamVjdHMuCisKKyAgICAgICAgVGhpcyBtYWRlIGl0IHNvIHRoYXQgcmFwaWRseSBvY2N1cnJp bmcgZWRlbiBjb2xsZWN0aW9ucyBjb3VsZCBwcmV2ZW50IGxhcmdlIG51bWJlcnMgb2YKKyAgICAg ICAgaGVhcCBibG9ja3MgZnJvbSBldmVyIGdldHRpbmcgc3dlcHQuIFRoaXMgd291bGQgbWFuaWZl c3QgYXMgYWNjdW11bGF0aW9uIG9mIE1hcmtlZEJsb2NrcworICAgICAgICB3aGVuIGEgc3lzdGVt IHVuZGVyIGhlYXZ5IGxvYWQgd2FzIGFsc28gYWxsb2NhdGluZyBzaG9ydCBsaXZlZCBvYmplY3Rz IGF0IGEgaGlnaCByYXRlLgorICAgICAgICBUaGluZ3Mgd291bGQgZXZlbnR1YWxseSBnZXQgY2xl YW5lZCB1cCB3aGVuIHRoZXJlIHdhcyBhIGx1bGwgYW5kIGEgZnVsbCBjb2xsZWN0aW9uIHdhcwor ICAgICAgICBhbGxvd2VkIHRvIHJ1biBpdHMgaGVhcCBzd2VlcCB0byBjb21wbGV0aW9uLgorCisg ICAgICAgIEZpeCB0aGlzIGJ5IG1vdmluZyBhbGwgbWFuYWdlbWVudCBvZiB0aGUgYmxvY2sgc25h cHNob3QgdG8gSGVhcC4gc25hcHNob3RNYXJrZWRTcGFjZSgpCisgICAgICAgIG5vdyBoYW5kbGVz IGVkZW4gY29sbGVjdGlvbnMgYnkgbWVyZ2luZyB0aGUgbGlzdCBvZiBibG9ja3Mgd2l0aCBuZXcg b2JqZWN0cyBpbnRvIHRoZQorICAgICAgICBleGlzdGluZyBibG9jayBzbmFwc2hvdC4KKworICAg ICAgICAqIGhlYXAvSGVhcC5jcHA6CisgICAgICAgIChKU0M6OkhlYXA6OnNuYXBzaG90TWFya2Vk U3BhY2UpOgorICAgICAgICAoSlNDOjpIZWFwOjpub3RpZnlJbmNyZW1lbnRhbFN3ZWVwZXIpOgor ICAgICAgICAqIGhlYXAvSW5jcmVtZW50YWxTd2VlcGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SW5j cmVtZW50YWxTd2VlcGVyOjpzdGFydFN3ZWVwaW5nKToKKyAgICAgICAgKEpTQzo6SW5jcmVtZW50 YWxTd2VlcGVyOjphZGRCbG9ja3NBbmRDb250aW51ZVN3ZWVwaW5nKTogRGVsZXRlZC4KKyAgICAg ICAgKiBoZWFwL0luY3JlbWVudGFsU3dlZXBlci5oOgorCiAyMDE1LTA1LTE5ICBDb21taXQgUXVl dWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTg0NjEzIGFuZCByMTg0NjE0LgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvSGVhcC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNw cAppbmRleCBiN2YyZjA0Li4xYjNlMWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaGVhcC9IZWFwLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNw cApAQCAtMTIxMiw5ICsxMjEyLDEyIEBAIHZvaWQgSGVhcDo6c25hcHNob3RNYXJrZWRTcGFjZSgp CiB7CiAgICAgR0NQSEFTRShTbmFwc2hvdE1hcmtlZFNwYWNlKTsKIAotICAgIGlmIChtX29wZXJh dGlvbkluUHJvZ3Jlc3MgPT0gRWRlbkNvbGxlY3Rpb24pCi0gICAgICAgIG1fYmxvY2tTbmFwc2hv dCA9IG1fb2JqZWN0U3BhY2UuYmxvY2tzV2l0aE5ld09iamVjdHMoKTsKLSAgICBlbHNlIHsKKyAg ICBpZiAobV9vcGVyYXRpb25JblByb2dyZXNzID09IEVkZW5Db2xsZWN0aW9uKSB7CisgICAgICAg IG1fYmxvY2tTbmFwc2hvdC5hcHBlbmRWZWN0b3IobV9vYmplY3RTcGFjZS5ibG9ja3NXaXRoTmV3 T2JqZWN0cygpKTsKKyAgICAgICAgLy8gU29ydCBhbmQgZGVkdXBsaWNhdGUgdGhlIGJsb2NrIHNu YXBzaG90IHNpbmNlIHdlIG1pZ2h0IGJlIGFwcGVuZGluZyB0byBhbiB1bmZpbmlzaGVkIHdvcmsg bGlzdC4KKyAgICAgICAgc3RkOjpzb3J0KG1fYmxvY2tzU25hcHNob3QuYmVnaW4oKSwgbV9ibG9j a3NTbmFwc2hvdC5lbmQoKSk7CisgICAgICAgIG1fYmxvY2tzU25hcHNob3Quc2hyaW5rKHN0ZDo6 dW5pcXVlKG1fYmxvY2tzU25hcHNob3QuYmVnaW4oKSwgbV9ibG9ja3NTbmFwc2hvdC5lbmQoKSkg LSBtX2Jsb2Nrc1NuYXBzaG90LmJlZ2luKCkpOworICAgIH0gZWxzZSB7CiAgICAgICAgIG1fYmxv Y2tTbmFwc2hvdC5yZXNpemVUb0ZpdChtX29iamVjdFNwYWNlLmJsb2NrcygpLnNldCgpLnNpemUo KSk7CiAgICAgICAgIE1hcmtlZEJsb2NrU25hcHNob3RGdW5jdG9yIGZ1bmN0b3IobV9ibG9ja1Nu YXBzaG90KTsKICAgICAgICAgbV9vYmplY3RTcGFjZS5mb3JFYWNoQmxvY2soZnVuY3Rvcik7CkBA IC0xMjMwLDEzICsxMjMzLDEzIEBAIHZvaWQgSGVhcDo6ZGVsZXRlU291cmNlUHJvdmlkZXJDYWNo ZXMoKQogdm9pZCBIZWFwOjpub3RpZnlJbmNyZW1lbnRhbFN3ZWVwZXIoKQogewogICAgIEdDUEhB U0UoTm90aWZ5SW5jcmVtZW50YWxTd2VlcGVyKTsKLSAgICBpZiAobV9vcGVyYXRpb25JblByb2dy ZXNzID09IEVkZW5Db2xsZWN0aW9uKQotICAgICAgICBtX3N3ZWVwZXItPmFkZEJsb2Nrc0FuZENv bnRpbnVlU3dlZXBpbmcoV1RGOjptb3ZlKG1fYmxvY2tTbmFwc2hvdCkpOwotICAgIGVsc2Ugewor CisgICAgaWYgKG1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9PSBGdWxsQ29sbGVjdGlvbikgewogICAg ICAgICBpZiAoIW1fbG9naWNhbGx5RW1wdHlXZWFrQmxvY2tzLmlzRW1wdHkoKSkKICAgICAgICAg ICAgIG1faW5kZXhPZk5leHRMb2dpY2FsbHlFbXB0eVdlYWtCbG9ja1RvU3dlZXAgPSAwOwotICAg ICAgICBtX3N3ZWVwZXItPnN0YXJ0U3dlZXBpbmcoV1RGOjptb3ZlKG1fYmxvY2tTbmFwc2hvdCkp OwogICAgIH0KKworICAgIG1fc3dlZXBlci0+c3RhcnRTd2VlcGluZygpOwogfQogCiB2b2lkIEhl YXA6OnJlbWVtYmVyQ3VycmVudGx5RXhlY3V0aW5nQ29kZUJsb2NrcygpCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9JbmNyZW1lbnRhbFN3ZWVwZXIuY3BwIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2hlYXAvSW5jcmVtZW50YWxTd2VlcGVyLmNwcAppbmRleCAzY2FmODFl Li4zZmY0ZDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9JbmNyZW1l bnRhbFN3ZWVwZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVu dGFsU3dlZXBlci5jcHAKQEAgLTEwMSwxOCArMTAxLDggQEAgYm9vbCBJbmNyZW1lbnRhbFN3ZWVw ZXI6OnN3ZWVwTmV4dEJsb2NrKCkKICAgICByZXR1cm4gbV92bS0+aGVhcC5zd2VlcE5leHRMb2dp Y2FsbHlFbXB0eVdlYWtCbG9jaygpOwogfQogCi12b2lkIEluY3JlbWVudGFsU3dlZXBlcjo6c3Rh cnRTd2VlcGluZyhWZWN0b3I8TWFya2VkQmxvY2sqPiYmIGJsb2NrU25hcHNob3QpCit2b2lkIElu Y3JlbWVudGFsU3dlZXBlcjo6c3RhcnRTd2VlcGluZygpCiB7Ci0gICAgbV9ibG9ja3NUb1N3ZWVw ID0gV1RGOjptb3ZlKGJsb2NrU25hcHNob3QpOwotICAgIHNjaGVkdWxlVGltZXIoKTsKLX0KLQot dm9pZCBJbmNyZW1lbnRhbFN3ZWVwZXI6OmFkZEJsb2Nrc0FuZENvbnRpbnVlU3dlZXBpbmcoVmVj dG9yPE1hcmtlZEJsb2NrKj4mJiBibG9ja1NuYXBzaG90KQotewotICAgIFZlY3RvcjxNYXJrZWRC bG9jayo+IGJsb2NrcyA9IFdURjo6bW92ZShibG9ja1NuYXBzaG90KTsKLSAgICBtX2Jsb2Nrc1Rv U3dlZXAuYXBwZW5kVmVjdG9yKGJsb2Nrcyk7Ci0gICAgc3RkOjpzb3J0KG1fYmxvY2tzVG9Td2Vl cC5iZWdpbigpLCBtX2Jsb2Nrc1RvU3dlZXAuZW5kKCkpOwotICAgIG1fYmxvY2tzVG9Td2VlcC5z aHJpbmsoc3RkOjp1bmlxdWUobV9ibG9ja3NUb1N3ZWVwLmJlZ2luKCksIG1fYmxvY2tzVG9Td2Vl cC5lbmQoKSkgLSBtX2Jsb2Nrc1RvU3dlZXAuYmVnaW4oKSk7CiAgICAgc2NoZWR1bGVUaW1lcigp OwogfQogCkBAIC0xMzQsMTEgKzEyNCw3IEBAIHZvaWQgSW5jcmVtZW50YWxTd2VlcGVyOjpkb1dv cmsoKQogewogfQogCi12b2lkIEluY3JlbWVudGFsU3dlZXBlcjo6c3RhcnRTd2VlcGluZyhWZWN0 b3I8TWFya2VkQmxvY2sqPiYmKQotewotfQotCi12b2lkIEluY3JlbWVudGFsU3dlZXBlcjo6YWRk QmxvY2tzQW5kQ29udGludWVTd2VlcGluZyhWZWN0b3I8TWFya2VkQmxvY2sqPiYmKQordm9pZCBJ bmNyZW1lbnRhbFN3ZWVwZXI6OnN0YXJ0U3dlZXBpbmcoKQogewogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9JbmNyZW1lbnRhbFN3ZWVwZXIuaCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dlZXBlci5oCmluZGV4IGZjZWE5MmIuLmY4 MTNhMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFs U3dlZXBlci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dl ZXBlci5oCkBAIC00NCw4ICs0NCw3IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBJbmNyZW1lbnRh bFN3ZWVwZXIoVk0qKTsKICNlbmRpZgogCi0gICAgdm9pZCBzdGFydFN3ZWVwaW5nKFZlY3RvcjxN YXJrZWRCbG9jayo+JiYpOwotICAgIHZvaWQgYWRkQmxvY2tzQW5kQ29udGludWVTd2VlcGluZyhW ZWN0b3I8TWFya2VkQmxvY2sqPiYmKTsKKyAgICB2b2lkIHN0YXJ0U3dlZXBpbmcoKTsKIAogICAg IEpTX0VYUE9SVF9QUklWQVRFIHZpcnR1YWwgdm9pZCBkb1dvcmsoKSBvdmVycmlkZTsKICAgICBi b29sIHN3ZWVwTmV4dEJsb2NrKCk7Cg== 253449 2015-05-20 11:07:20 -0700 2015-05-20 13:30:51 -0700 Patch bug-145213.diff text/plain 5659 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGZkODMzMDIuLmY3NzM3ZTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE1LTA1LTIwICBBbmRyZWFzIEtsaW5n ICA8YWtsaW5nQGFwcGxlLmNvbT4KKworICAgICAgICBFZGVuIGNvbGxlY3Rpb25zIHNob3VsZCBl eHRlbmQgdGhlIEluY3JlbWVudGFsU3dlZXBlciB3b3JrIGxpc3QsIG5vdCByZXBsYWNlIGl0Lgor ICAgICAgICA8aHR0cHM6Ly93ZWJraXQub3JnL2IvMTQ1MjEzPgorICAgICAgICA8cmRhcjovL3By b2JsZW0vMjEwMDI2NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWZ0ZXIgYW4gZWRlbiBjb2xsZWN0aW9uLCB0aGUgZ2FyYmFnZSBjb2xsZWN0b3Ig d2FzIGFkZGluZyBhbGwgTWFya2VkQmxvY2tzIGNvbnRhaW5pbmcKKyAgICAgICAgbmV3IG9iamVj dHMgdG8gdGhlIEluY3JlbWVudGFsU3dlZXBlcidzIHdvcmsgbGlzdCwgdG8gbWFrZSBzdXJlIHRo ZXkgZGlkbid0IGhhdmUgdG8KKyAgICAgICAgd2FpdCB1bnRpbCB0aGUgbmV4dCBmdWxsIGNvbGxl Y3Rpb24gYmVmb3JlIGdldHRpbmcgc3dlcHQuCisKKyAgICAgICAgT3IgYXQgbGVhc3QsIHRoYXQn cyB3aGF0IGl0IHRob3VnaHQgaXQgd2FzIGRvaW5nLiBJdCB0dXJucyBvdXQgdGhhdCBJbmNyZW1l bnRhbFN3ZWVwZXIncworICAgICAgICBpbnRlcm5hbCB3b3JrIGxpc3QgaXMgcmVhbGx5IGp1c3Qg YSByZWZlcmVuY2UgdG8gSGVhcDo6bV9ibG9ja1NuYXBzaG90LiBJIGRpZG4ndCByZWFsaXplCisg ICAgICAgIHRoaXMgd2hlbiB3cml0aW5nIHRoZSBwb3N0LWVkZW4gc3dlZXAgY29kZSwgYW5kIGlu c3RlYWQgbWFkZSBlZGVuIGNvbGxlY3Rpb25zIGNhbmNlbAorICAgICAgICBhbGwgcGVuZGluZyBz d2VlcHMgYW5kICpyZXBsYWNlKiB0aGVtIHdpdGggdGhlIGxpc3Qgb2YgYmxvY2tzIHdpdGggbmV3 IG9iamVjdHMuCisKKyAgICAgICAgVGhpcyBtYWRlIGl0IHNvIHRoYXQgcmFwaWRseSBvY2N1cnJp bmcgZWRlbiBjb2xsZWN0aW9ucyBjb3VsZCBwcmV2ZW50IGxhcmdlIG51bWJlcnMgb2YKKyAgICAg ICAgaGVhcCBibG9ja3MgZnJvbSBldmVyIGdldHRpbmcgc3dlcHQuIFRoaXMgd291bGQgbWFuaWZl c3QgYXMgYWNjdW11bGF0aW9uIG9mIE1hcmtlZEJsb2NrcworICAgICAgICB3aGVuIGEgc3lzdGVt IHVuZGVyIGhlYXZ5IGxvYWQgd2FzIGFsc28gYWxsb2NhdGluZyBzaG9ydCBsaXZlZCBvYmplY3Rz IGF0IGEgaGlnaCByYXRlLgorICAgICAgICBUaGluZ3Mgd291bGQgZXZlbnR1YWxseSBnZXQgY2xl YW5lZCB1cCB3aGVuIHRoZXJlIHdhcyBhIGx1bGwgYW5kIGEgZnVsbCBjb2xsZWN0aW9uIHdhcwor ICAgICAgICBhbGxvd2VkIHRvIHJ1biBpdHMgaGVhcCBzd2VlcCB0byBjb21wbGV0aW9uLgorCisg ICAgICAgIEZpeCB0aGlzIGJ5IG1vdmluZyBhbGwgbWFuYWdlbWVudCBvZiB0aGUgYmxvY2sgc25h cHNob3QgdG8gSGVhcC4gc25hcHNob3RNYXJrZWRTcGFjZSgpCisgICAgICAgIG5vdyBoYW5kbGVz IGVkZW4gY29sbGVjdGlvbnMgYnkgbWVyZ2luZyB0aGUgbGlzdCBvZiBibG9ja3Mgd2l0aCBuZXcg b2JqZWN0cyBpbnRvIHRoZQorICAgICAgICBleGlzdGluZyBibG9jayBzbmFwc2hvdC4KKworICAg ICAgICAqIGhlYXAvSGVhcC5jcHA6CisgICAgICAgIChKU0M6OkhlYXA6OnNuYXBzaG90TWFya2Vk U3BhY2UpOgorICAgICAgICAoSlNDOjpIZWFwOjpub3RpZnlJbmNyZW1lbnRhbFN3ZWVwZXIpOgor ICAgICAgICAqIGhlYXAvSW5jcmVtZW50YWxTd2VlcGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SW5j cmVtZW50YWxTd2VlcGVyOjpzdGFydFN3ZWVwaW5nKToKKyAgICAgICAgKEpTQzo6SW5jcmVtZW50 YWxTd2VlcGVyOjphZGRCbG9ja3NBbmRDb250aW51ZVN3ZWVwaW5nKTogRGVsZXRlZC4KKyAgICAg ICAgKiBoZWFwL0luY3JlbWVudGFsU3dlZXBlci5oOgorCiAyMDE1LTA1LTE5ICBDb21taXQgUXVl dWUgIDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByMTg0NjEzIGFuZCByMTg0NjE0LgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvSGVhcC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNw cAppbmRleCBiN2YyZjA0Li5lNDMwOWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaGVhcC9IZWFwLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9IZWFwLmNw cApAQCAtMTIxMiw5ICsxMjEyLDEyIEBAIHZvaWQgSGVhcDo6c25hcHNob3RNYXJrZWRTcGFjZSgp CiB7CiAgICAgR0NQSEFTRShTbmFwc2hvdE1hcmtlZFNwYWNlKTsKIAotICAgIGlmIChtX29wZXJh dGlvbkluUHJvZ3Jlc3MgPT0gRWRlbkNvbGxlY3Rpb24pCi0gICAgICAgIG1fYmxvY2tTbmFwc2hv dCA9IG1fb2JqZWN0U3BhY2UuYmxvY2tzV2l0aE5ld09iamVjdHMoKTsKLSAgICBlbHNlIHsKKyAg ICBpZiAobV9vcGVyYXRpb25JblByb2dyZXNzID09IEVkZW5Db2xsZWN0aW9uKSB7CisgICAgICAg IG1fYmxvY2tTbmFwc2hvdC5hcHBlbmRWZWN0b3IobV9vYmplY3RTcGFjZS5ibG9ja3NXaXRoTmV3 T2JqZWN0cygpKTsKKyAgICAgICAgLy8gU29ydCBhbmQgZGVkdXBsaWNhdGUgdGhlIGJsb2NrIHNu YXBzaG90IHNpbmNlIHdlIG1pZ2h0IGJlIGFwcGVuZGluZyB0byBhbiB1bmZpbmlzaGVkIHdvcmsg bGlzdC4KKyAgICAgICAgc3RkOjpzb3J0KG1fYmxvY2tTbmFwc2hvdC5iZWdpbigpLCBtX2Jsb2Nr U25hcHNob3QuZW5kKCkpOworICAgICAgICBtX2Jsb2NrU25hcHNob3Quc2hyaW5rKHN0ZDo6dW5p cXVlKG1fYmxvY2tTbmFwc2hvdC5iZWdpbigpLCBtX2Jsb2NrU25hcHNob3QuZW5kKCkpIC0gbV9i bG9ja1NuYXBzaG90LmJlZ2luKCkpOworICAgIH0gZWxzZSB7CiAgICAgICAgIG1fYmxvY2tTbmFw c2hvdC5yZXNpemVUb0ZpdChtX29iamVjdFNwYWNlLmJsb2NrcygpLnNldCgpLnNpemUoKSk7CiAg ICAgICAgIE1hcmtlZEJsb2NrU25hcHNob3RGdW5jdG9yIGZ1bmN0b3IobV9ibG9ja1NuYXBzaG90 KTsKICAgICAgICAgbV9vYmplY3RTcGFjZS5mb3JFYWNoQmxvY2soZnVuY3Rvcik7CkBAIC0xMjMw LDEzICsxMjMzLDEzIEBAIHZvaWQgSGVhcDo6ZGVsZXRlU291cmNlUHJvdmlkZXJDYWNoZXMoKQog dm9pZCBIZWFwOjpub3RpZnlJbmNyZW1lbnRhbFN3ZWVwZXIoKQogewogICAgIEdDUEhBU0UoTm90 aWZ5SW5jcmVtZW50YWxTd2VlcGVyKTsKLSAgICBpZiAobV9vcGVyYXRpb25JblByb2dyZXNzID09 IEVkZW5Db2xsZWN0aW9uKQotICAgICAgICBtX3N3ZWVwZXItPmFkZEJsb2Nrc0FuZENvbnRpbnVl U3dlZXBpbmcoV1RGOjptb3ZlKG1fYmxvY2tTbmFwc2hvdCkpOwotICAgIGVsc2UgeworCisgICAg aWYgKG1fb3BlcmF0aW9uSW5Qcm9ncmVzcyA9PSBGdWxsQ29sbGVjdGlvbikgewogICAgICAgICBp ZiAoIW1fbG9naWNhbGx5RW1wdHlXZWFrQmxvY2tzLmlzRW1wdHkoKSkKICAgICAgICAgICAgIG1f aW5kZXhPZk5leHRMb2dpY2FsbHlFbXB0eVdlYWtCbG9ja1RvU3dlZXAgPSAwOwotICAgICAgICBt X3N3ZWVwZXItPnN0YXJ0U3dlZXBpbmcoV1RGOjptb3ZlKG1fYmxvY2tTbmFwc2hvdCkpOwogICAg IH0KKworICAgIG1fc3dlZXBlci0+c3RhcnRTd2VlcGluZygpOwogfQogCiB2b2lkIEhlYXA6OnJl bWVtYmVyQ3VycmVudGx5RXhlY3V0aW5nQ29kZUJsb2NrcygpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9JbmNyZW1lbnRhbFN3ZWVwZXIuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvSW5jcmVtZW50YWxTd2VlcGVyLmNwcAppbmRleCAzY2FmODFlLi4zZmY0 ZDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9JbmNyZW1lbnRhbFN3 ZWVwZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dl ZXBlci5jcHAKQEAgLTEwMSwxOCArMTAxLDggQEAgYm9vbCBJbmNyZW1lbnRhbFN3ZWVwZXI6OnN3 ZWVwTmV4dEJsb2NrKCkKICAgICByZXR1cm4gbV92bS0+aGVhcC5zd2VlcE5leHRMb2dpY2FsbHlF bXB0eVdlYWtCbG9jaygpOwogfQogCi12b2lkIEluY3JlbWVudGFsU3dlZXBlcjo6c3RhcnRTd2Vl cGluZyhWZWN0b3I8TWFya2VkQmxvY2sqPiYmIGJsb2NrU25hcHNob3QpCit2b2lkIEluY3JlbWVu dGFsU3dlZXBlcjo6c3RhcnRTd2VlcGluZygpCiB7Ci0gICAgbV9ibG9ja3NUb1N3ZWVwID0gV1RG Ojptb3ZlKGJsb2NrU25hcHNob3QpOwotICAgIHNjaGVkdWxlVGltZXIoKTsKLX0KLQotdm9pZCBJ bmNyZW1lbnRhbFN3ZWVwZXI6OmFkZEJsb2Nrc0FuZENvbnRpbnVlU3dlZXBpbmcoVmVjdG9yPE1h cmtlZEJsb2NrKj4mJiBibG9ja1NuYXBzaG90KQotewotICAgIFZlY3RvcjxNYXJrZWRCbG9jayo+ IGJsb2NrcyA9IFdURjo6bW92ZShibG9ja1NuYXBzaG90KTsKLSAgICBtX2Jsb2Nrc1RvU3dlZXAu YXBwZW5kVmVjdG9yKGJsb2Nrcyk7Ci0gICAgc3RkOjpzb3J0KG1fYmxvY2tzVG9Td2VlcC5iZWdp bigpLCBtX2Jsb2Nrc1RvU3dlZXAuZW5kKCkpOwotICAgIG1fYmxvY2tzVG9Td2VlcC5zaHJpbmso c3RkOjp1bmlxdWUobV9ibG9ja3NUb1N3ZWVwLmJlZ2luKCksIG1fYmxvY2tzVG9Td2VlcC5lbmQo KSkgLSBtX2Jsb2Nrc1RvU3dlZXAuYmVnaW4oKSk7CiAgICAgc2NoZWR1bGVUaW1lcigpOwogfQog CkBAIC0xMzQsMTEgKzEyNCw3IEBAIHZvaWQgSW5jcmVtZW50YWxTd2VlcGVyOjpkb1dvcmsoKQog ewogfQogCi12b2lkIEluY3JlbWVudGFsU3dlZXBlcjo6c3RhcnRTd2VlcGluZyhWZWN0b3I8TWFy a2VkQmxvY2sqPiYmKQotewotfQotCi12b2lkIEluY3JlbWVudGFsU3dlZXBlcjo6YWRkQmxvY2tz QW5kQ29udGludWVTd2VlcGluZyhWZWN0b3I8TWFya2VkQmxvY2sqPiYmKQordm9pZCBJbmNyZW1l bnRhbFN3ZWVwZXI6OnN0YXJ0U3dlZXBpbmcoKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9JbmNyZW1lbnRhbFN3ZWVwZXIuaCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dlZXBlci5oCmluZGV4IGZjZWE5MmIuLmY4MTNhMzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dlZXBl ci5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0luY3JlbWVudGFsU3dlZXBlci5o CkBAIC00NCw4ICs0NCw3IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBJbmNyZW1lbnRhbFN3ZWVw ZXIoVk0qKTsKICNlbmRpZgogCi0gICAgdm9pZCBzdGFydFN3ZWVwaW5nKFZlY3RvcjxNYXJrZWRC bG9jayo+JiYpOwotICAgIHZvaWQgYWRkQmxvY2tzQW5kQ29udGludWVTd2VlcGluZyhWZWN0b3I8 TWFya2VkQmxvY2sqPiYmKTsKKyAgICB2b2lkIHN0YXJ0U3dlZXBpbmcoKTsKIAogICAgIEpTX0VY UE9SVF9QUklWQVRFIHZpcnR1YWwgdm9pZCBkb1dvcmsoKSBvdmVycmlkZTsKICAgICBib29sIHN3 ZWVwTmV4dEJsb2NrKCk7Cg==