233387 2021-11-19 15:17:52 -0800 REGRESSION(r286030): 5% JetStream2 regression 2021-11-19 15:20:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 228053 1 commit-queue commit-queue rmorisset saam webkit-bug-importer ysuzuki oldest_to_newest 1817021 0 commit-queue 2021-11-19 15:17:52 -0800 https://commits.webkit.org/r286030 introduced a regression: 5% JetStream2 regression This is an automatic bug report generated by webkitbot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests fail. 1817023 1 444864 commit-queue 2021-11-19 15:18:00 -0800 Created attachment 444864 REVERT of r286030 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the revert will be successful. This process takes approximately 15 minutes. If you would like to land the revert faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID where ATTACHMENT_ID is the ID of this attachment. 1817024 2 ews-feeder 2021-11-19 15:19:54 -0800 Committed r286083 (244470@main): <https://commits.webkit.org/244470@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444864. 1817025 3 webkit-bug-importer 2021-11-19 15:20:25 -0800 <rdar://problem/85621779> 444864 2021-11-19 15:18:00 -0800 2021-11-19 15:19:55 -0800 REVERT of r286030 bug-233387-20211119151759.patch text/plain 12884 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAy NmNmNjliYTNjYzQ0MTFiOGZjYmQ3Y2I4YjEyMWFhYzQzMmVhM2QxLi44YTg5OWFmZTE4Nzg4ZjE0 YzYyMGYwNGM4ZjkyNGZjYjk5NzdkMDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMS0xMS0xOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyODYwMzAuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMzODcKKworICAgICAg ICA1JSBKZXRTdHJlYW0yIHJlZ3Jlc3Npb24KKworICAgICAgICBSZXZlcnRlZCBjaGFuZ2VzZXQ6 CisKKyAgICAgICAgIkRGR0J5dGVDb2RlUGFyc2VyLmNwcCBzaG91bGQgYXZvaWQgcmVzaXppbmcg dGhlIE9wZXJhbmRzPD4gb2YKKyAgICAgICAgZXZlcnkgQmFzaWNCbG9jayBvbiBldmVyeSBpbmxp bmluZyIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy ODA1MworICAgICAgICBodHRwczovL2NvbW1pdHMud2Via2l0Lm9yZy9yMjg2MDMwCisKIDIwMjEt MTEtMTkgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGFz c2VydGlvbiBhZGRlZCBpbiByMjg1NTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvT3BlcmFuZHMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9P cGVyYW5kcy5oCmluZGV4IGM5MWJlN2NkMWFhMWRlMTU3OGMyMjUzYWE1MjY5OGQ0N2FmMzcxYWMu LjA0YzUxZTVlMTExNzFlZGNiMTg1ZTJmOTc5ZjU5NDMwOTBlMjM5MWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9PcGVyYW5kcy5oCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ieXRlY29kZS9PcGVyYW5kcy5oCkBAIC0yNzQsMjUgKzI3NCwxNiBAQCBwdWJs aWM6CiAgICAgICAgIH0KICAgICB9CiAKLSAgICB2b2lkIGVuc3VyZUxvY2Fsc0FuZFRtcHMoc2l6 ZV90IG5ld051bUxvY2Fscywgc2l6ZV90IG5ld051bVRtcHMsIGNvbnN0IFQmIGVuc3VyZWRWYWx1 ZSA9IFQoKSkKKyAgICB2b2lkIGVuc3VyZVRtcHMoc2l6ZV90IHNpemUsIGNvbnN0IFQmIGVuc3Vy ZWRWYWx1ZSA9IFQoKSkKICAgICB7Ci0gICAgICAgIEFTU0VSVChuZXdOdW1Mb2NhbHMgPj0gbnVt YmVyT2ZMb2NhbHMoKSk7Ci0gICAgICAgIEFTU0VSVChuZXdOdW1UbXBzID49IG51bWJlck9mVG1w cygpKTsKLQotICAgICAgICBzaXplX3Qgb2xkTnVtTG9jYWxzID0gbnVtYmVyT2ZMb2NhbHMoKTsK LSAgICAgICAgc2l6ZV90IG9sZE51bVRtcHMgPSBudW1iZXJPZlRtcHMoKTsKKyAgICAgICAgaWYg KHNpemUgPD0gbnVtYmVyT2ZUbXBzKCkpCisgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAg c2l6ZV90IG9sZFNpemUgPSBtX3ZhbHVlcy5zaXplKCk7Ci0gICAgICAgIHNpemVfdCBuZXdTaXpl ID0gbnVtYmVyT2ZBcmd1bWVudHMoKSArIG5ld051bUxvY2FscyArIG5ld051bVRtcHM7CisgICAg ICAgIHNpemVfdCBuZXdTaXplID0gbnVtYmVyT2ZBcmd1bWVudHMoKSArIG51bWJlck9mTG9jYWxz KCkgKyBzaXplOwogICAgICAgICBtX3ZhbHVlcy5ncm93KG5ld1NpemUpOwogCi0gICAgICAgIGZv ciAoc2l6ZV90IGkgPSAwOyBpIDwgb2xkTnVtVG1wczsgKytpKQotICAgICAgICAgICAgbV92YWx1 ZXNbbmV3U2l6ZSAtIDEgLSBpXSA9IG1fdmFsdWVzW3RtcEluZGV4KG9sZE51bVRtcHMgLSAxIC0g aSldOwotCi0gICAgICAgIG1fbnVtTG9jYWxzID0gbmV3TnVtTG9jYWxzOwogICAgICAgICBpZiAo ZW5zdXJlZFZhbHVlICE9IFQoKSB8fCAhV1RGOjpWZWN0b3JUcmFpdHM8VD46Om5lZWRzSW5pdGlh bGl6YXRpb24pIHsKLSAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbmV3TnVtTG9j YWxzIC0gb2xkTnVtTG9jYWxzOyArK2kpCi0gICAgICAgICAgICAgICAgbV92YWx1ZXNbbG9jYWxJ bmRleChvbGROdW1Mb2NhbHMgKyBpKV0gPSBlbnN1cmVkVmFsdWU7CiAgICAgICAgICAgICBmb3Ig KHNpemVfdCBpID0gb2xkU2l6ZTsgaSA8IG5ld1NpemU7ICsraSkKICAgICAgICAgICAgICAgICBt X3ZhbHVlc1tpXSA9IGVuc3VyZWRWYWx1ZTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCYXNpY0Jsb2NrLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQmFzaWNCbG9jay5jcHAKaW5kZXggYmQ3ZDdjMjBkYWY4OGJmNmMzYjBhZjEx MjM0YWNmZWM1ZDQ5NDMzMC4uOTI0ZjZkNDNjNDY5YzYwZGU1MWZhNjhhODI4MjZlNGFjYTUzMzA1 NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCYXNpY0Jsb2NrLmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Jhc2ljQmxvY2suY3BwCkBAIC02 Myw2ICs2MywyNCBAQCBCYXNpY0Jsb2NrOjp+QmFzaWNCbG9jaygpCiB7CiB9CiAKK3ZvaWQgQmFz aWNCbG9jazo6ZW5zdXJlTG9jYWxzKHVuc2lnbmVkIG5ld051bUxvY2FscykKK3sKKyAgICB2YXJp YWJsZXNBdEhlYWQuZW5zdXJlTG9jYWxzKG5ld051bUxvY2Fscyk7CisgICAgdmFyaWFibGVzQXRU YWlsLmVuc3VyZUxvY2FscyhuZXdOdW1Mb2NhbHMpOworICAgIHZhbHVlc0F0SGVhZC5lbnN1cmVM b2NhbHMobmV3TnVtTG9jYWxzKTsKKyAgICB2YWx1ZXNBdFRhaWwuZW5zdXJlTG9jYWxzKG5ld051 bUxvY2Fscyk7CisgICAgaW50ZXJzZWN0aW9uT2ZQYXN0VmFsdWVzQXRIZWFkLmVuc3VyZUxvY2Fs cyhuZXdOdW1Mb2NhbHMsIEFic3RyYWN0VmFsdWU6OmZ1bGxUb3AoKSk7Cit9CisKK3ZvaWQgQmFz aWNCbG9jazo6ZW5zdXJlVG1wcyh1bnNpZ25lZCBuZXdOdW1UbXBzKQoreworICAgIHZhcmlhYmxl c0F0SGVhZC5lbnN1cmVUbXBzKG5ld051bVRtcHMpOworICAgIHZhcmlhYmxlc0F0VGFpbC5lbnN1 cmVUbXBzKG5ld051bVRtcHMpOworICAgIHZhbHVlc0F0SGVhZC5lbnN1cmVUbXBzKG5ld051bVRt cHMpOworICAgIHZhbHVlc0F0VGFpbC5lbnN1cmVUbXBzKG5ld051bVRtcHMpOworICAgIGludGVy c2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZC5lbnN1cmVUbXBzKG5ld051bVRtcHMsIEFic3RyYWN0 VmFsdWU6OmZ1bGxUb3AoKSk7Cit9CisKIHZvaWQgQmFzaWNCbG9jazo6cmVwbGFjZVRlcm1pbmFs KEdyYXBoJiBncmFwaCwgTm9kZSogbm9kZSkKIHsKICAgICBOb2RlQW5kSW5kZXggcmVzdWx0ID0g ZmluZFRlcm1pbmFsKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R0Jhc2ljQmxvY2suaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQmFzaWNCbG9jay5o CmluZGV4IDdlY2VhMjA0N2U3OGI5OGY1N2MzZThkOGE0ZGJhYWQ5MzBkN2MyNDguLjJjOGE2MTM2 ZjM1ODEyZjBkYmU5ZWMyNWU4MWVmZDI3YWYwMTNiMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHQmFzaWNCbG9jay5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQmFzaWNCbG9jay5oCkBAIC01Myw2ICs1Myw5IEBAIHN0cnVjdCBCYXNpY0Jsb2Nr IDogUmVmQ291bnRlZDxCYXNpY0Jsb2NrPiB7CiAgICAgICAgIGZsb2F0IGV4ZWN1dGlvbkNvdW50 KTsKICAgICB+QmFzaWNCbG9jaygpOwogICAgIAorICAgIHZvaWQgZW5zdXJlTG9jYWxzKHVuc2ln bmVkIG5ld051bUxvY2Fscyk7CisgICAgdm9pZCBlbnN1cmVUbXBzKHVuc2lnbmVkIG5ld051bVRt cHMpOworICAgIAogICAgIHNpemVfdCBzaXplKCkgY29uc3QgeyByZXR1cm4gbV9ub2Rlcy5zaXpl KCk7IH0KICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiAhc2l6ZSgpOyB9CiAgICAg Tm9kZSomIGF0KHNpemVfdCBpKSB7IHJldHVybiBtX25vZGVzW2ldOyB9CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCmluZGV4IGUxZjliODdkYzky ZWMwOGExZTI5ODYxMjlmNWZiN2ZmNzA5MWY1ZmQuLmU0OWM1MjRlYzNjMGMyMzc3YWVlODBhNjFj MDIyMjM5YTdkNGRhYmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0 ZUNvZGVQYXJzZXIuY3BwCkBAIC0xMzgsMjUgKzEzOCwyNCBAQCBwcml2YXRlOgogICAgIC8vIEp1 c3QgcGFyc2UgZnJvbSBtX2N1cnJlbnRJbmRleCB0byB0aGUgZW5kIG9mIHRoZSBjdXJyZW50IENv ZGVCbG9jay4KICAgICB2b2lkIHBhcnNlQ29kZUJsb2NrKCk7CiAgICAgCi0gICAgdm9pZCBlbnN1 cmVMb2NhbHNGb3JWYXJpYWJsZXNBdFRhaWwodW5zaWduZWQgbmV3TnVtTG9jYWxzKQorICAgIHZv aWQgZW5zdXJlTG9jYWxzKHVuc2lnbmVkIG5ld051bUxvY2FscykKICAgICB7CiAgICAgICAgIFZF UkJPU0VfTE9HKCIgICBlbnN1cmVMb2NhbHM6IHRyeWluZyB0byByYWlzZSBtX251bUxvY2FscyBm cm9tICIsIG1fbnVtTG9jYWxzLCAiIHRvICIsIG5ld051bUxvY2FscywgIlxuIik7CiAgICAgICAg IGlmIChuZXdOdW1Mb2NhbHMgPD0gbV9udW1Mb2NhbHMpCiAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgIG1fbnVtTG9jYWxzID0gbmV3TnVtTG9jYWxzOwogICAgICAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IG1fZ3JhcGgubnVtQmxvY2tzKCk7ICsraSkKLSAgICAgICAgICAgIG1fZ3JhcGgu YmxvY2soaSktPnZhcmlhYmxlc0F0VGFpbC5lbnN1cmVMb2NhbHMobmV3TnVtTG9jYWxzKTsKKyAg ICAgICAgICAgIG1fZ3JhcGguYmxvY2soaSktPmVuc3VyZUxvY2FscyhuZXdOdW1Mb2NhbHMpOwog ICAgIH0KIAotICAgIHZvaWQgZW5zdXJlTG9jYWxzQW5kVG1wc0ZvclZhcmlhYmxlc0F0VGFpbCh1 bnNpZ25lZCBuZXdOdW1Mb2NhbHMsIHVuc2lnbmVkIG5ld051bVRtcHMpCisgICAgdm9pZCBlbnN1 cmVUbXBzKHVuc2lnbmVkIG5ld051bVRtcHMpCiAgICAgewotICAgICAgICBWRVJCT1NFX0xPRygi ICAgZW5zdXJlTG9jYWxzQW5kVG1wczogdHJ5aW5nIHRvIHJhaXNlIG1fbnVtTG9jYWxzL21fbnVt VG1wcyBmcm9tICIsIG1fbnVtTG9jYWxzLCAiLyIsIG1fbnVtVG1wcywgIiB0byAiLCBuZXdOdW1M b2NhbHMsICIvIiwgbmV3TnVtVG1wcywgIlxuIik7Ci0gICAgICAgIGlmIChuZXdOdW1Mb2NhbHMg PD0gbV9udW1Mb2NhbHMgJiYgbmV3TnVtVG1wcyA8PSBtX251bVRtcHMpCisgICAgICAgIFZFUkJP U0VfTE9HKCIgICBlbnN1cmVUbXBzOiB0cnlpbmcgdG8gcmFpc2UgbV9udW1UbXBzIGZyb20gIiwg bV9udW1UbXBzLCAiIHRvICIsIG5ld051bVRtcHMsICJcbiIpOworICAgICAgICBpZiAobmV3TnVt VG1wcyA8PSBtX251bVRtcHMpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIG1fbnVtTG9j YWxzID0gc3RkOjptYXgobV9udW1Mb2NhbHMsIG5ld051bUxvY2Fscyk7Ci0gICAgICAgIG1fbnVt VG1wcyA9IHN0ZDo6bWF4KG1fbnVtVG1wcywgbmV3TnVtVG1wcyk7CisgICAgICAgIG1fbnVtVG1w cyA9IG5ld051bVRtcHM7CiAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9ncmFwaC5u dW1CbG9ja3MoKTsgKytpKQotICAgICAgICAgICAgbV9ncmFwaC5ibG9jayhpKS0+dmFyaWFibGVz QXRUYWlsLmVuc3VyZUxvY2Fsc0FuZFRtcHMobV9udW1Mb2NhbHMsIG1fbnVtVG1wcyk7CisgICAg ICAgICAgICBtX2dyYXBoLmJsb2NrKGkpLT5lbnN1cmVUbXBzKG5ld051bVRtcHMpOwogICAgIH0K IAogCkBAIC0xNzIsOCArMTcxLDYgQEAgcHJpdmF0ZToKICAgICAvLyB0aGFuIHRvIG1vdmUgdGhl IHJpZ2h0IGluZGV4IGFsbCB0aGUgd2F5IHRvIHRoZSB0cmVhdG1lbnQgb2Ygb3BfcmV0LgogICAg IEJhc2ljQmxvY2sqIGFsbG9jYXRlVGFyZ2V0YWJsZUJsb2NrKEJ5dGVjb2RlSW5kZXgpOwogICAg IEJhc2ljQmxvY2sqIGFsbG9jYXRlVW50YXJnZXRhYmxlQmxvY2soKTsKLSAgICAvLyBIZWxwZXIg Zm9yIGFsbG9jYXRlVGFyZ2V0YWJsZUJsb2NrIGFuZCBhbGxvY2F0ZVVudGFyZ2V0YWJsZUJsb2Nr LCBkbyBub3QgdXNlIGRpcmVjdGx5Ci0gICAgQmFzaWNCbG9jayogYWxsb2NhdGVCbG9jayhCeXRl Y29kZUluZGV4KTsKICAgICAvLyBBbiB1bnRhcmdldGFibGUgYmxvY2sgY2FuIGJlIGdpdmVuIGEg Ynl0ZWNvZGVJbmRleCB0byBiZSBsYXRlciBtYW5hZ2VkIGJ5IGxpbmtCbG9jaywgYnV0IG9ubHkg b25jZSwgYW5kIGl0IGNhbiBuZXZlciBnbyBpbiB0aGUgb3RoZXIgZGlyZWN0aW9uCiAgICAgdm9p ZCBtYWtlQmxvY2tUYXJnZXRhYmxlKEJhc2ljQmxvY2sqLCBCeXRlY29kZUluZGV4KTsKICAgICB2 b2lkIGFkZEp1bXBUbyhCYXNpY0Jsb2NrKik7CkBAIC0xMjY1LDMyICsxMjYyLDI0IEBAIHByaXZh dGU6CiAgICAgYm9vbCBtX2hhc0FueUZvcmNlT1NSRXhpdHMgeyBmYWxzZSB9OwogfTsKIAotQmFz aWNCbG9jayogQnl0ZUNvZGVQYXJzZXI6OmFsbG9jYXRlQmxvY2soQnl0ZWNvZGVJbmRleCBieXRl Y29kZUluZGV4KQotewotICAgIC8vIFdlIGRvbid0IGJvdGhlciBpbml0aWFsaXppbmcgbW9zdCBP cGVyYW5kcyBoZXJlLCBzaW5jZSBpbmxpbmluZyBjYW4gY2hhbmdlIHRoZSBudW1iZXIgb2YgbG9j YWxzIGFuZCB0bXBzLgotICAgIC8vIFdlIG9ubHkgaW5pdGlhbGl6ZSB2YXJpYWJsZXNBdFRhaWwg YmVjYXVzZSBpdCBpcyB0aGUgb25seSBwYXJ0IHdoaWNoIGlzIHVzZWQgaW4gdGhlIGJ5dGVjb2Rl IHBhcnNlcgotICAgIC8vIFdlIHdpbGwgaW5pdGlhbGl6ZSBhbGwgb2YgdGhlIG90aGVyIE9wZXJh bmRzIGluIGJ1bGsgYXQgdGhlIGVuZCBvZiB0aGUgcGhhc2UuCi0gICAgUmVmPEJhc2ljQmxvY2s+ IGJsb2NrID0gYWRvcHRSZWYoKm5ldyBCYXNpY0Jsb2NrKGJ5dGVjb2RlSW5kZXgsIDAsIDAsIDAs IDEpKTsKLSAgICBCYXNpY0Jsb2NrKiBibG9ja1B0ciA9IGJsb2NrLnB0cigpOwotICAgIGJsb2Nr UHRyLT52YXJpYWJsZXNBdFRhaWwgPSBPcGVyYW5kczxOb2RlKj4obV9udW1Bcmd1bWVudHMsIG1f bnVtTG9jYWxzLCBtX251bVRtcHMpOwotICAgIG1fZ3JhcGguYXBwZW5kQmxvY2soV1RGTW92ZShi bG9jaykpOwotICAgIHJldHVybiBibG9ja1B0cjsKLX0KLQogQmFzaWNCbG9jayogQnl0ZUNvZGVQ YXJzZXI6OmFsbG9jYXRlVGFyZ2V0YWJsZUJsb2NrKEJ5dGVjb2RlSW5kZXggYnl0ZWNvZGVJbmRl eCkKIHsKICAgICBBU1NFUlQoYnl0ZWNvZGVJbmRleCk7CisgICAgUmVmPEJhc2ljQmxvY2s+IGJs b2NrID0gYWRvcHRSZWYoKm5ldyBCYXNpY0Jsb2NrKGJ5dGVjb2RlSW5kZXgsIG1fbnVtQXJndW1l bnRzLCBtX251bUxvY2FscywgbV9udW1UbXBzLCAxKSk7CisgICAgQmFzaWNCbG9jayogYmxvY2tQ dHIgPSBibG9jay5wdHIoKTsKICAgICAvLyBtX2Jsb2NrTGlua2luZ1RhcmdldHMgbXVzdCBhbHdh eXMgYmUgc29ydGVkIGluIGluY3JlYXNpbmcgb3JkZXIgb2YgYnl0ZWNvZGVCZWdpbgogICAgIGlm IChtX2lubGluZVN0YWNrVG9wLT5tX2Jsb2NrTGlua2luZ1RhcmdldHMuc2l6ZSgpKQogICAgICAg ICBBU1NFUlQobV9pbmxpbmVTdGFja1RvcC0+bV9ibG9ja0xpbmtpbmdUYXJnZXRzLmxhc3QoKS0+ Ynl0ZWNvZGVCZWdpbi5vZmZzZXQoKSA8IGJ5dGVjb2RlSW5kZXgub2Zmc2V0KCkpOwotICAgIEJh c2ljQmxvY2sqIGJsb2NrUHRyID0gYWxsb2NhdGVCbG9jayhieXRlY29kZUluZGV4KTsKICAgICBt X2lubGluZVN0YWNrVG9wLT5tX2Jsb2NrTGlua2luZ1RhcmdldHMuYXBwZW5kKGJsb2NrUHRyKTsK KyAgICBtX2dyYXBoLmFwcGVuZEJsb2NrKFdURk1vdmUoYmxvY2spKTsKICAgICByZXR1cm4gYmxv Y2tQdHI7CiB9CiAKIEJhc2ljQmxvY2sqIEJ5dGVDb2RlUGFyc2VyOjphbGxvY2F0ZVVudGFyZ2V0 YWJsZUJsb2NrKCkKIHsKLSAgICBCYXNpY0Jsb2NrKiBibG9ja1B0ciA9IGFsbG9jYXRlQmxvY2so Qnl0ZWNvZGVJbmRleCgpKTsKKyAgICBSZWY8QmFzaWNCbG9jaz4gYmxvY2sgPSBhZG9wdFJlZigq bmV3IEJhc2ljQmxvY2soQnl0ZWNvZGVJbmRleCgpLCBtX251bUFyZ3VtZW50cywgbV9udW1Mb2Nh bHMsIG1fbnVtVG1wcywgMSkpOworICAgIEJhc2ljQmxvY2sqIGJsb2NrUHRyID0gYmxvY2sucHRy KCk7CisgICAgbV9ncmFwaC5hcHBlbmRCbG9jayhXVEZNb3ZlKGJsb2NrKSk7CiAgICAgVkVSQk9T RV9MT0coIkFkZGluZyBuZXcgdW50YXJnZXRhYmxlIGJsb2NrOiAiLCBibG9ja1B0ci0+aW5kZXgs ICJcbiIpOwogICAgIHJldHVybiBibG9ja1B0cjsKIH0KQEAgLTE2ODgsOSArMTY3NywxMSBAQCB2 b2lkIEJ5dGVDb2RlUGFyc2VyOjppbmxpbmVDYWxsKE5vZGUqIGNhbGxUYXJnZXROb2RlLCBPcGVy YW5kIHJlc3VsdCwgQ2FsbFZhcmlhbgogICAgIAogICAgIE9wZXJhbmQgaW5saW5lQ2FsbEZyYW1l U3RhcnQgPSBWaXJ0dWFsUmVnaXN0ZXIobV9pbmxpbmVTdGFja1RvcC0+cmVtYXBPcGVyYW5kKFZp cnR1YWxSZWdpc3RlcihyZWdpc3Rlck9mZnNldEFmdGVyRml4dXApKS52YWx1ZSgpICsgQ2FsbEZy YW1lOjpoZWFkZXJTaXplSW5SZWdpc3RlcnMpOwogICAgIAotICAgIHVuc2lnbmVkIG51bUxvY2Fs cyA9IGlubGluZUNhbGxGcmFtZVN0YXJ0LnRvTG9jYWwoKSArIDEgKyBDYWxsRnJhbWU6OmhlYWRl clNpemVJblJlZ2lzdGVycyArIGNvZGVCbG9jay0+bnVtQ2FsbGVlTG9jYWxzKCk7Ci0gICAgdW5z aWduZWQgbnVtVG1wcyA9IChtX2lubGluZVN0YWNrVG9wLT5tX2lubGluZUNhbGxGcmFtZSA/IG1f aW5saW5lU3RhY2tUb3AtPm1faW5saW5lQ2FsbEZyYW1lLT50bXBPZmZzZXQgOiAwKSArIG1faW5s aW5lU3RhY2tUb3AtPm1fY29kZUJsb2NrLT5udW1UbXBzKCkgKyBjb2RlQmxvY2stPm51bVRtcHMo KTsKLSAgICBlbnN1cmVMb2NhbHNBbmRUbXBzRm9yVmFyaWFibGVzQXRUYWlsKG51bUxvY2Fscywg bnVtVG1wcyk7CisgICAgZW5zdXJlTG9jYWxzKAorICAgICAgICBpbmxpbmVDYWxsRnJhbWVTdGFy dC50b0xvY2FsKCkgKyAxICsKKyAgICAgICAgQ2FsbEZyYW1lOjpoZWFkZXJTaXplSW5SZWdpc3Rl cnMgKyBjb2RlQmxvY2stPm51bUNhbGxlZUxvY2FscygpKTsKKyAgICAKKyAgICBlbnN1cmVUbXBz KChtX2lubGluZVN0YWNrVG9wLT5tX2lubGluZUNhbGxGcmFtZSA/IG1faW5saW5lU3RhY2tUb3At Pm1faW5saW5lQ2FsbEZyYW1lLT50bXBPZmZzZXQgOiAwKSArIG1faW5saW5lU3RhY2tUb3AtPm1f Y29kZUJsb2NrLT5udW1UbXBzKCkgKyBjb2RlQmxvY2stPm51bVRtcHMoKSk7CiAKICAgICBzaXpl X3QgYXJndW1lbnRQb3NpdGlvblN0YXJ0ID0gbV9ncmFwaC5tX2FyZ3VtZW50UG9zaXRpb25zLnNp emUoKTsKIApAQCAtMjAwMyw3ICsxOTk0LDcgQEAgYm9vbCBCeXRlQ29kZVBhcnNlcjo6aGFuZGxl VmFyYXJnc0lubGluaW5nKE5vZGUqIGNhbGxUYXJnZXROb2RlLCBPcGVyYW5kIHJlc3VsdCwKICAg ICAgICAgaW50IHJlbWFwcGVkUmVnaXN0ZXJPZmZzZXQgPQogICAgICAgICBtX2lubGluZVN0YWNr VG9wLT5yZW1hcE9wZXJhbmQoVmlydHVhbFJlZ2lzdGVyKHJlZ2lzdGVyT2Zmc2V0KSkudmlydHVh bFJlZ2lzdGVyKCkub2Zmc2V0KCk7CiAgICAgICAgIAotICAgICAgICBlbnN1cmVMb2NhbHNGb3JW YXJpYWJsZXNBdFRhaWwoVmlydHVhbFJlZ2lzdGVyKHJlbWFwcGVkUmVnaXN0ZXJPZmZzZXQpLnRv TG9jYWwoKSk7CisgICAgICAgIGVuc3VyZUxvY2FscyhWaXJ0dWFsUmVnaXN0ZXIocmVtYXBwZWRS ZWdpc3Rlck9mZnNldCkudG9Mb2NhbCgpKTsKICAgICAgICAgCiAgICAgICAgIGludCBhcmd1bWVu dFN0YXJ0ID0gcmVnaXN0ZXJPZmZzZXQgKyBDYWxsRnJhbWU6OmhlYWRlclNpemVJblJlZ2lzdGVy czsKICAgICAgICAgaW50IHJlbWFwcGVkQXJndW1lbnRTdGFydCA9IG1faW5saW5lU3RhY2tUb3At PnJlbWFwT3BlcmFuZChWaXJ0dWFsUmVnaXN0ZXIoYXJndW1lbnRTdGFydCkpLnZpcnR1YWxSZWdp c3RlcigpLm9mZnNldCgpOwpAQCAtNDgwMCw3ICs0NzkxLDcgQEAgdm9pZCBCeXRlQ29kZVBhcnNl cjo6aGFuZGxlR2V0QnlJZCgKICAgICAgICAgc3RhY2tBbGlnbm1lbnRSZWdpc3RlcnMoKSwKICAg ICAgICAgLXJlZ2lzdGVyT2Zmc2V0KTsKICAgICAKLSAgICBlbnN1cmVMb2NhbHNGb3JWYXJpYWJs ZXNBdFRhaWwoCisgICAgZW5zdXJlTG9jYWxzKAogICAgICAgICBtX2lubGluZVN0YWNrVG9wLT5y ZW1hcE9wZXJhbmQoCiAgICAgICAgICAgICBWaXJ0dWFsUmVnaXN0ZXIocmVnaXN0ZXJPZmZzZXQp KS50b0xvY2FsKCkpOwogICAgIApAQCAtNTE5NCw3ICs1MTg1LDcgQEAgdm9pZCBCeXRlQ29kZVBh cnNlcjo6aGFuZGxlUHV0QnlJZCgKICAgICAgICAgICAgIHN0YWNrQWxpZ25tZW50UmVnaXN0ZXJz KCksCiAgICAgICAgICAgICAtcmVnaXN0ZXJPZmZzZXQpOwogICAgIAotICAgICAgICBlbnN1cmVM b2NhbHNGb3JWYXJpYWJsZXNBdFRhaWwoCisgICAgICAgIGVuc3VyZUxvY2FscygKICAgICAgICAg ICAgIG1faW5saW5lU3RhY2tUb3AtPnJlbWFwT3BlcmFuZCgKICAgICAgICAgICAgICAgICBWaXJ0 dWFsUmVnaXN0ZXIocmVnaXN0ZXJPZmZzZXQpKS50b0xvY2FsKCkpOwogICAgIApAQCAtOTA0OSwx NyArOTA0MCw2IEBAIHZvaWQgQnl0ZUNvZGVQYXJzZXI6OnBhcnNlKCkKICAgICBwYXJzZUNvZGVC bG9jaygpOwogICAgIGxpbmtCbG9ja3MoaW5saW5lU3RhY2tFbnRyeS5tX3VubGlua2VkQmxvY2tz LCBpbmxpbmVTdGFja0VudHJ5Lm1fYmxvY2tMaW5raW5nVGFyZ2V0cyk7CiAKLSAgICBmb3IgKEJh c2ljQmxvY2sqIGJsb2NrIDogbV9ncmFwaC5ibG9ja3NJbk5hdHVyYWxPcmRlcigpKSB7Ci0gICAg ICAgIC8vIFdlIGtlcHQgYmxvY2stPnZhcmlhYmxlc0F0VGFpbCB1cGRhdGVkIHRocm91Z2hvdXQs IGJ1dCBub3QgdGhlIG90aGVyIE9wZXJhbmRzLCB0byBhdm9pZCBoYXZpbmcgdG8gcmVzaXplIHRo ZW0gZXZlcnkgdGltZSB3ZSBpbmxpbmUKLSAgICAgICAgQVNTRVJUKGJsb2NrLT52YXJpYWJsZXNB dFRhaWwubnVtYmVyT2ZBcmd1bWVudHMoKSA9PSBtX251bUFyZ3VtZW50cyk7Ci0gICAgICAgIEFT U0VSVChibG9jay0+dmFyaWFibGVzQXRUYWlsLm51bWJlck9mTG9jYWxzKCkgPT0gbV9udW1Mb2Nh bHMpOwotICAgICAgICBBU1NFUlQoYmxvY2stPnZhcmlhYmxlc0F0VGFpbC5udW1iZXJPZlRtcHMo KSA9PSBtX251bVRtcHMpOwotICAgICAgICBibG9jay0+dmFyaWFibGVzQXRIZWFkID0gT3BlcmFu ZHM8Tm9kZSo+KE9wZXJhbmRzTGlrZSwgYmxvY2stPnZhcmlhYmxlc0F0VGFpbCk7Ci0gICAgICAg IGJsb2NrLT52YWx1ZXNBdEhlYWQgPSBPcGVyYW5kczxBYnN0cmFjdFZhbHVlPihPcGVyYW5kc0xp a2UsIGJsb2NrLT52YXJpYWJsZXNBdFRhaWwpOwotICAgICAgICBibG9jay0+dmFsdWVzQXRUYWls ID0gT3BlcmFuZHM8QWJzdHJhY3RWYWx1ZT4oT3BlcmFuZHNMaWtlLCBibG9jay0+dmFyaWFibGVz QXRUYWlsKTsKLSAgICAgICAgYmxvY2stPmludGVyc2VjdGlvbk9mUGFzdFZhbHVlc0F0SGVhZCA9 IE9wZXJhbmRzPEFic3RyYWN0VmFsdWU+KE9wZXJhbmRzTGlrZSwgYmxvY2stPnZhcmlhYmxlc0F0 VGFpbCk7Ci0gICAgfQotCiAgICAgLy8gV2UgcnVuIGJhY2t3YXJkcyBwcm9wYWdhdGlvbiBub3cg YmVjYXVzZSB0aGUgc291bmRuZXNzIG9mIHRoYXQgcGhhc2UKICAgICAvLyByZWxpZXMgb24gc2Vl aW5nIHRoZSBncmFwaCBhcyBpZiBpdCB3ZXJlIGFuIElSIG92ZXIgYnl0ZWNvZGUsIHNpbmNlCiAg ICAgLy8gdGhlIHNwZWMtY29ycmVjdG5lc3Mgb2YgdGhhdCBwaGFzZSByZWxpZXMgb24gc2VlaW5n IGFsbCBieXRlY29kZSB1c2VzLgpAQCAtOTE3Niw2ICs5MTU2LDE2IEBAIHZvaWQgQnl0ZUNvZGVQ YXJzZXI6OnBhcnNlKCkKICAgICBtX2dyYXBoLmRldGVybWluZVJlYWNoYWJpbGl0eSgpOwogICAg IG1fZ3JhcGgua2lsbFVucmVhY2hhYmxlQmxvY2tzKCk7CiAKKyAgICBmb3IgKEJsb2NrSW5kZXgg YmxvY2tJbmRleCA9IG1fZ3JhcGgubnVtQmxvY2tzKCk7IGJsb2NrSW5kZXgtLTspIHsKKyAgICAg ICAgQmFzaWNCbG9jayogYmxvY2sgPSBtX2dyYXBoLmJsb2NrKGJsb2NrSW5kZXgpOworICAgICAg ICBpZiAoIWJsb2NrKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIEFTU0VSVChibG9j ay0+dmFyaWFibGVzQXRIZWFkLm51bWJlck9mTG9jYWxzKCkgPT0gbV9ncmFwaC5ibG9jaygwKS0+ dmFyaWFibGVzQXRIZWFkLm51bWJlck9mTG9jYWxzKCkpOworICAgICAgICBBU1NFUlQoYmxvY2st PnZhcmlhYmxlc0F0SGVhZC5udW1iZXJPZkFyZ3VtZW50cygpID09IG1fZ3JhcGguYmxvY2soMCkt PnZhcmlhYmxlc0F0SGVhZC5udW1iZXJPZkFyZ3VtZW50cygpKTsKKyAgICAgICAgQVNTRVJUKGJs b2NrLT52YXJpYWJsZXNBdFRhaWwubnVtYmVyT2ZMb2NhbHMoKSA9PSBtX2dyYXBoLmJsb2NrKDAp LT52YXJpYWJsZXNBdEhlYWQubnVtYmVyT2ZMb2NhbHMoKSk7CisgICAgICAgIEFTU0VSVChibG9j ay0+dmFyaWFibGVzQXRUYWlsLm51bWJlck9mQXJndW1lbnRzKCkgPT0gbV9ncmFwaC5ibG9jaygw KS0+dmFyaWFibGVzQXRIZWFkLm51bWJlck9mQXJndW1lbnRzKCkpOworICAgIH0KKwogICAgIG1f Z3JhcGgubV90bXBzID0gbV9udW1UbXBzOwogICAgIG1fZ3JhcGgubV9sb2NhbFZhcnMgPSBtX251 bUxvY2FsczsKICAgICBtX2dyYXBoLm1fcGFyYW1ldGVyU2xvdHMgPSBtX3BhcmFtZXRlclNsb3Rz Owo=