216119 2020-09-02 22:34:30 -0700 Static assert the return type of compactMap 2020-09-03 00:49:14 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215879 InRadar P2 Normal --- 1 rniwa rniwa darin saam webkit-bug-importer ysuzuki oldest_to_newest 1685186 0 rniwa 2020-09-02 22:34:30 -0700 Per Darin's comment in https://bugs.webkit.org/show_bug.cgi?id=215879#c24, we should static_assert the return type of compactMap in the unit tests. 1685188 1 407869 rniwa 2020-09-02 22:38:10 -0700 Created attachment 407869 Updated tests 1685205 2 407869 rniwa 2020-09-03 00:48:58 -0700 Comment on attachment 407869 Updated tests Clearing flags on attachment: 407869 Committed r266506: <https://trac.webkit.org/changeset/266506> 1685206 3 rniwa 2020-09-03 00:48:59 -0700 All reviewed patches have been landed. Closing bug. 1685207 4 webkit-bug-importer 2020-09-03 00:49:14 -0700 <rdar://problem/68261818> 407869 2020-09-02 22:38:10 -0700 2020-09-03 00:48:58 -0700 Updated tests bug-216119-20200902223808.patch text/plain 9218 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NDk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzIzN2VhMWMxN2RmMzg5ODk3ZmM1MTA3ZTE1ZTE5MmI2 ZDJkZDU5NS4uNjVkMmQwOTI2NjM4NzU2OTc3OTNiYTQ5NmNlOWY3YTMyMGJhYjJjZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIwLTA5LTAyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIFN0YXRpYyBhc3NlcnQgdGhlIHJldHVybiB0eXBlIG9mIGNvbXBhY3RNYXAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjExOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIHN0YXRpY19hc3Nl cnQgZm9yIHRoZSByZXR1cm4gdHlwZXMgb2YgY29tcGFjdE1hcCBpbiB2YXJvaXVzIHVuaXQgdGVz dHMuCisKKyAgICAgICAgKFdURl9WZWN0b3IuQ29tcGFjdE1hcFN0YXRpY0Z1bmN0aW9uUmV0dXJu T3B0aW9uYWwpOgorICAgICAgICAoV1RGX1ZlY3Rvci5Db21wYWN0TWFwU3RhdGljRnVuY3Rpb25S ZXR1cm5SZWZQdHIpOgorICAgICAgICAoV1RGX1ZlY3Rvci5Db21wYWN0TWFwU3RhdGljRnVuY3Rp b25SZXR1cm5PcHRpb25hbFJlZik6CisgICAgICAgIChXVEZfVmVjdG9yLkNvbXBhY3RNYXBTdGF0 aWNGdW5jdGlvblJldHVybk9wdGlvbmFsUmVmUHRyKToKKyAgICAgICAgKFdURl9WZWN0b3IuQ29t cGFjdE1hcExhbWJkYVJldHVybk9wdGlvbmFsKToKKyAgICAgICAgKFdURl9WZWN0b3IuQ29tcGFj dE1hcExhbWJkYUNvcHlWZWN0b3JSZXR1cm5PcHRpb25hbENvdW50ZWRPYmplY3QpOgorICAgICAg ICAoV1RGX1ZlY3Rvci5Db21wYWN0TWFwTGFtYmRhTW92ZVZlY3RvclJldHVybk9wdGlvbmFsQ291 bnRlZE9iamVjdCk6CisgICAgICAgIChXVEZfVmVjdG9yLkNvbXBhY3RNYXBMYW1iZGFSZXR1cm5S ZWZQdHIpOgorICAgICAgICAoV1RGX1ZlY3Rvci5Db21wYWN0TWFwTGFtYmRhUmV0dXJuUmVmUHRy RnJvbU1vdmVkUmVmKToKKyAgICAgICAgKFdURl9WZWN0b3IuQ29tcGFjdE1hcExhbWJkYVJldHVy bk9wdGlvbmFsUmVmUHRyKToKKwogMjAyMC0wOS0wMiAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBs ZS5jb20+CiAKICAgICAgICAgVXBkYXRlIEtpbW1vJ3MgZW1haWwuCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9WZWN0b3IuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XVEYvVmVjdG9yLmNwcAppbmRleCBkZDFjZDk1NjliZGRmMGNlYjE3NjhmZmQwZjEx NDllY2Q2NGRhNzkxLi41NTkyMGQ4ZWY2MDAzOWE4NDg5NDhiMjQxNDEyNzA5ZTNlZmM1NDM4IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9WZWN0b3IuY3BwCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL1ZlY3Rvci5jcHAKQEAgLTg4Miw2ICs4ODIs OCBAQCBURVNUKFdURl9WZWN0b3IsIENvbXBhY3RNYXBTdGF0aWNGdW5jdGlvblJldHVybk9wdGlv bmFsKQogewogICAgIFZlY3RvcjxpbnQ+IHZlY3RvciB7IDEsIDIsIDMsIDQgfTsKIAorICAgIHN0 YXRpY19hc3NlcnQoc3RkOjppc19zYW1lPGRlY2x0eXBlKFdURjo6Y29tcGFjdE1hcCh2ZWN0b3Is IGV2ZW5NdWx0aXBsaWVkQnlGaXZlKSksIHR5cGVuYW1lIFdURjo6VmVjdG9yPGludD4+Ojp2YWx1 ZSwKKyAgICAgICAgIldURjo6Y29tcGFjdE1hcCByZXR1cm5zIFZlY3RvcjxSZWY8Pj4gd2hlbiB0 aGUgbWFwcGVkIGZ1bmN0aW9uIHJldHVybnMgT3B0aW9uYWw8PiIpOwogICAgIGF1dG8gbWFwcGVk ID0gV1RGOjpjb21wYWN0TWFwKHZlY3RvciwgZXZlbk11bHRpcGxpZWRCeUZpdmUpOwogCiAgICAg RVhQRUNUX0VRKDJVLCBtYXBwZWQuc2l6ZSgpKTsKQEAgLTkyMyw3ICs5MjUsOSBAQCBURVNUKFdU Rl9WZWN0b3IsIENvbXBhY3RNYXBTdGF0aWNGdW5jdGlvblJldHVyblJlZlB0cikKICAgICBWZWN0 b3I8aW50PiB2ZWN0b3IgeyAxLCAyLCAzLCA0IH07CiAKICAgICBSZWZDb3VudGVkT2JqZWN0Ojpz X3RvdGFsUmVmQ291bnQgPSAwOwotICAgIFZlY3RvcjxSZWY8UmVmQ291bnRlZE9iamVjdD4+IG1h cHBlZCA9IFdURjo6Y29tcGFjdE1hcCh2ZWN0b3IsIGNyZWF0ZVJlZkNvdW50ZWRGb3JPZGQpOwor ICAgIHN0YXRpY19hc3NlcnQoc3RkOjppc19zYW1lPGRlY2x0eXBlKFdURjo6Y29tcGFjdE1hcCh2 ZWN0b3IsIGNyZWF0ZVJlZkNvdW50ZWRGb3JPZGQpKSwgdHlwZW5hbWUgV1RGOjpWZWN0b3I8UmVm PFJlZkNvdW50ZWRPYmplY3Q+Pj46OnZhbHVlLAorICAgICAgICAiV1RGOjpjb21wYWN0TWFwIHJl dHVybnMgVmVjdG9yPGludD4gd2hlbiB0aGUgbWFwcGVkIGZ1bmN0aW9uIHJldHVybnMgT3B0aW9u YWw8aW50PiIpOworICAgIGF1dG8gbWFwcGVkID0gV1RGOjpjb21wYWN0TWFwKHZlY3RvciwgY3Jl YXRlUmVmQ291bnRlZEZvck9kZCk7CiAKICAgICBFWFBFQ1RfRVEoMFUsIFJlZkNvdW50ZWRPYmpl Y3Q6OnNfdG90YWxSZWZDb3VudCk7CiAgICAgRVhQRUNUX0VRKDJVLCBtYXBwZWQuc2l6ZSgpKTsK QEAgLTk0Myw2ICs5NDcsOCBAQCBURVNUKFdURl9WZWN0b3IsIENvbXBhY3RNYXBTdGF0aWNGdW5j dGlvblJldHVybk9wdGlvbmFsUmVmKQogICAgIFZlY3RvcjxpbnQ+IHZlY3RvciB7IDEsIDIsIDMs IDQgfTsKIAogICAgIFJlZkNvdW50ZWRPYmplY3Q6OnNfdG90YWxSZWZDb3VudCA9IDA7CisgICAg c3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWU8ZGVjbHR5cGUoV1RGOjpjb21wYWN0TWFwKHZlY3Rv ciwgY3JlYXRlUmVmQ291bnRlZEZvckV2ZW4pKSwgdHlwZW5hbWUgV1RGOjpWZWN0b3I8UmVmPFJl ZkNvdW50ZWRPYmplY3Q+Pj46OnZhbHVlLAorICAgICAgICAiV1RGOjpjb21wYWN0TWFwIHJldHVy bnMgVmVjdG9yPFJlZjw+PiB3aGVuIHRoZSBtYXBwZWQgZnVuY3Rpb24gcmV0dXJucyBSZWZQdHI8 PiIpOwogICAgIGF1dG8gbWFwcGVkID0gV1RGOjpjb21wYWN0TWFwKHZlY3RvciwgY3JlYXRlUmVm Q291bnRlZEZvckV2ZW4pOwogCiAgICAgRVhQRUNUX0VRKDBVLCBSZWZDb3VudGVkT2JqZWN0Ojpz X3RvdGFsUmVmQ291bnQpOwpAQCAtOTY1LDcgKzk3MSw5IEBAIFRFU1QoV1RGX1ZlY3RvciwgQ29t cGFjdE1hcFN0YXRpY0Z1bmN0aW9uUmV0dXJuT3B0aW9uYWxSZWZQdHIpCiAgICAgVmVjdG9yPGlu dD4gdmVjdG9yIHsgMSwgMiwgMywgNCwgNSwgNiwgNywgOCwgOSwgMTAgfTsKIAogICAgIFJlZkNv dW50ZWRPYmplY3Q6OnNfdG90YWxSZWZDb3VudCA9IDA7Ci0gICAgVmVjdG9yPFJlZlB0cjxSZWZD b3VudGVkT2JqZWN0Pj4gbWFwcGVkID0gV1RGOjpjb21wYWN0TWFwKHZlY3RvciwgY3JlYXRlUmVm Q291bnRlZFdoZW5EaXZpc2libGVCeVRocmVlKTsKKyAgICBzdGF0aWNfYXNzZXJ0KHN0ZDo6aXNf c2FtZTxkZWNsdHlwZShXVEY6OmNvbXBhY3RNYXAodmVjdG9yLCBjcmVhdGVSZWZDb3VudGVkV2hl bkRpdmlzaWJsZUJ5VGhyZWUpKSwgdHlwZW5hbWUgV1RGOjpWZWN0b3I8UmVmUHRyPFJlZkNvdW50 ZWRPYmplY3Q+Pj46OnZhbHVlLAorICAgICAgICAiV1RGOjpjb21wYWN0TWFwIHJldHVybnMgVmVj dG9yPFJlZlB0cjw+PiB3aGVuIHRoZSBtYXBwZWQgZnVuY3Rpb24gcmV0dXJucyBPcHRpb25hbDxS ZWZQdHI8Pj4iKTsKKyAgICBhdXRvIG1hcHBlZCA9IFdURjo6Y29tcGFjdE1hcCh2ZWN0b3IsIGNy ZWF0ZVJlZkNvdW50ZWRXaGVuRGl2aXNpYmxlQnlUaHJlZSk7CiAKICAgICBFWFBFQ1RfRVEoMFUs IFJlZkNvdW50ZWRPYmplY3Q6OnNfdG90YWxSZWZDb3VudCk7CiAgICAgRVhQRUNUX0VRKDNVLCBt YXBwZWQuc2l6ZSgpKTsKQEAgLTk3OCwxMSArOTg2LDE0IEBAIFRFU1QoV1RGX1ZlY3RvciwgQ29t cGFjdE1hcExhbWJkYVJldHVybk9wdGlvbmFsKQogewogICAgIFZlY3RvcjxTdHJpbmc+IHZlY3Rv ciB7ICJhIiwgImIiLCAiaGVsbG8iLCAiY2lhbyIsICJ3b3JsZCIsICJ3ZWJraXQiIH07CiAKLSAg ICBhdXRvIG1hcHBlZCA9IFdURjo6Y29tcGFjdE1hcCh2ZWN0b3IsIFtdKGNvbnN0IFN0cmluZyYg dmFsdWUpIC0+IE9wdGlvbmFsPFN0cmluZz4geworICAgIGF1dG8gZnVuY3Rpb24gPSBbXShjb25z dCBTdHJpbmcmIHZhbHVlKSAtPiBPcHRpb25hbDxTdHJpbmc+IHsKICAgICAgICAgaWYgKHZhbHVl Lmxlbmd0aCgpIDwgNSkKICAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAgICAgICAg IHJldHVybiB2YWx1ZS5jb252ZXJ0VG9BU0NJSVVwcGVyY2FzZSgpOwotICAgIH0pOworICAgIH07 CisgICAgc3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWU8ZGVjbHR5cGUoV1RGOjpjb21wYWN0TWFw KHZlY3RvciwgZnVuY3Rpb24pKSwgdHlwZW5hbWUgV1RGOjpWZWN0b3I8U3RyaW5nPj46OnZhbHVl LAorICAgICAgICAiV1RGOjpjb21wYWN0TWFwIHJldHVybnMgVmVjdG9yPFN0cmluZz4gd2hlbiB0 aGUgbWFwcGVkIGZ1bmN0aW9uIHJldHVybnMgT3B0aW9uYWw8U3RyaW5nPiIpOworICAgIGF1dG8g bWFwcGVkID0gV1RGOjpjb21wYWN0TWFwKHZlY3RvciwgZnVuY3Rpb24pOwogCiAgICAgRVhQRUNU X0VRKDNVLCBtYXBwZWQuc2l6ZSgpKTsKICAgICBFWFBFQ1RfU1RSRVEoIkhFTExPIiwgbWFwcGVk WzBdLmFzY2lpKCkuZGF0YSgpKTsKQEAgLTEwMjIsMTEgKzEwMzMsMTUgQEAgVEVTVChXVEZfVmVj dG9yLCBDb21wYWN0TWFwTGFtYmRhQ29weVZlY3RvclJldHVybk9wdGlvbmFsQ291bnRlZE9iamVj dCkKIAogICAgIENvdW50ZWRPYmplY3Q6OmNvdW50KCkgPSAwOwogCi0gICAgYXV0byBtYXBwZWQg PSBXVEY6OmNvbXBhY3RNYXAodmVjdG9yLCBbXShjb25zdCBDb3VudGVkT2JqZWN0JiBvYmplY3Qp IC0+IE9wdGlvbmFsPENvdW50ZWRPYmplY3Q+IHsKKyAgICBhdXRvIGZ1bmN0aW9uID0gW10oY29u c3QgQ291bnRlZE9iamVjdCYgb2JqZWN0KSAtPiBPcHRpb25hbDxDb3VudGVkT2JqZWN0PiB7CiAg ICAgICAgIGlmIChvYmplY3QudmFsdWUoKSAlIDIpCiAgICAgICAgICAgICByZXR1cm4gb2JqZWN0 OwogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotICAgIH0pOworICAgIH07CisKKyAgICBz dGF0aWNfYXNzZXJ0KHN0ZDo6aXNfc2FtZTxkZWNsdHlwZShXVEY6OmNvbXBhY3RNYXAodmVjdG9y LCBmdW5jdGlvbikpLCB0eXBlbmFtZSBXVEY6OlZlY3RvcjxDb3VudGVkT2JqZWN0Pj46OnZhbHVl LAorICAgICAgICAiV1RGOjpjb21wYWN0TWFwIHJldHVybnMgVmVjdG9yPENvdW50ZWRPYmplY3Q+ IHdoZW4gdGhlIGxhbWJkYSByZXR1cm5zIE9wdGlvbmFsPENvdW50ZWRPYmplY3Q+Iik7CisgICAg YXV0byBtYXBwZWQgPSBXVEY6OmNvbXBhY3RNYXAodmVjdG9yLCBmdW5jdGlvbik7CiAKICAgICBF WFBFQ1RfRVEoMlUsIENvdW50ZWRPYmplY3Q6OmNvdW50KCkpOwogCkBAIC0xMDQxLDEyICsxMDU2 LDE2IEBAIFRFU1QoV1RGX1ZlY3RvciwgQ29tcGFjdE1hcExhbWJkYU1vdmVWZWN0b3JSZXR1cm5P cHRpb25hbENvdW50ZWRPYmplY3QpCiAKICAgICBDb3VudGVkT2JqZWN0Ojpjb3VudCgpID0gMDsK IAotICAgIFJlZkNvdW50ZWRPYmplY3Q6OnNfdG90YWxSZWZDb3VudCA9IDA7Ci0gICAgYXV0byBt YXBwZWQgPSBXVEY6OmNvbXBhY3RNYXAoV1RGTW92ZSh2ZWN0b3IpLCBbXShDb3VudGVkT2JqZWN0 JiYgb2JqZWN0KSAtPiBPcHRpb25hbDxDb3VudGVkT2JqZWN0PiB7CisgICAgYXV0byBmdW5jdGlv biA9IFtdKENvdW50ZWRPYmplY3QmJiBvYmplY3QpIC0+IE9wdGlvbmFsPENvdW50ZWRPYmplY3Q+ IHsKICAgICAgICAgaWYgKG9iamVjdC52YWx1ZSgpICUgMikKICAgICAgICAgICAgIHJldHVybiBX VEZNb3ZlKG9iamVjdCk7CiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7Ci0gICAgfSk7Cisg ICAgfTsKKworICAgIFJlZkNvdW50ZWRPYmplY3Q6OnNfdG90YWxSZWZDb3VudCA9IDA7CisgICAg c3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWU8ZGVjbHR5cGUoV1RGOjpjb21wYWN0TWFwKFdURk1v dmUodmVjdG9yKSwgZnVuY3Rpb24pKSwgdHlwZW5hbWUgV1RGOjpWZWN0b3I8Q291bnRlZE9iamVj dD4+Ojp2YWx1ZSwKKyAgICAgICAgIldURjo6Y29tcGFjdE1hcCByZXR1cm5zIFZlY3RvcjxDb3Vu dGVkT2JqZWN0PiB3aGVuIHRoZSBsYW1iZGEgcmV0dXJucyBPcHRpb25hbDxDb3VudGVkT2JqZWN0 PiIpOworICAgIGF1dG8gbWFwcGVkID0gV1RGOjpjb21wYWN0TWFwKFdURk1vdmUodmVjdG9yKSwg ZnVuY3Rpb24pOwogCiAgICAgRVhQRUNUX0VRKDBVLCBDb3VudGVkT2JqZWN0Ojpjb3VudCgpKTsK IApAQCAtMTA1OSwxMiArMTA3OCwxNiBAQCBURVNUKFdURl9WZWN0b3IsIENvbXBhY3RNYXBMYW1i ZGFSZXR1cm5SZWZQdHIpCiB7CiAgICAgVmVjdG9yPGludD4gdmVjdG9yIHsgMSwgMiwgMywgNCwg NSwgNiwgNywgOCwgOSwgMTAgfTsKIAotICAgIFJlZkNvdW50ZWRPYmplY3Q6OnNfdG90YWxSZWZD b3VudCA9IDA7Ci0gICAgVmVjdG9yPFJlZjxSZWZDb3VudGVkT2JqZWN0Pj4gbWFwcGVkID0gV1RG Ojpjb21wYWN0TWFwKHZlY3RvciwgW10oaW50IHZhbHVlKSAtPiBSZWZQdHI8UmVmQ291bnRlZE9i amVjdD4geworICAgIGF1dG8gZnVuY3Rpb24gPSBbXShpbnQgdmFsdWUpIC0+IFJlZlB0cjxSZWZD b3VudGVkT2JqZWN0PiB7CiAgICAgICAgIGlmICh2YWx1ZSAlIDMpCiAgICAgICAgICAgICByZXR1 cm4gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIFJlZkNvdW50ZWRPYmplY3Q6OmNyZWF0ZSh2YWx1 ZSk7Ci0gICAgfSk7CisgICAgfTsKKworICAgIFJlZkNvdW50ZWRPYmplY3Q6OnNfdG90YWxSZWZD b3VudCA9IDA7CisgICAgc3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWU8ZGVjbHR5cGUoV1RGOjpj b21wYWN0TWFwKHZlY3RvciwgZnVuY3Rpb24pKSwgdHlwZW5hbWUgV1RGOjpWZWN0b3I8UmVmPFJl ZkNvdW50ZWRPYmplY3Q+Pj46OnZhbHVlLAorICAgICAgICAiV1RGOjpjb21wYWN0TWFwIHJldHVy bnMgVmVjdG9yPFJlZjxSZWZDb3VudGVkT2JqZWN0Pj4gd2hlbiB0aGUgbGFtYmRhIHJldHVybnMg UmVmUHRyPFJlZkNvdW50ZWRPYmplY3Q+Iik7CisgICAgYXV0byBtYXBwZWQgPSBXVEY6OmNvbXBh Y3RNYXAodmVjdG9yLCBmdW5jdGlvbik7CiAKICAgICBFWFBFQ1RfRVEoMFUsIFJlZkNvdW50ZWRP YmplY3Q6OnNfdG90YWxSZWZDb3VudCk7CiAgICAgRVhQRUNUX0VRKDNVLCBtYXBwZWQuc2l6ZSgp KTsKQEAgLTEwODEsMTIgKzExMDQsMTYgQEAgVEVTVChXVEZfVmVjdG9yLCBDb21wYWN0TWFwTGFt YmRhUmV0dXJuUmVmUHRyRnJvbU1vdmVkUmVmKQogICAgICAgICByZXR1cm4gUmVmQ291bnRlZE9i amVjdDo6Y3JlYXRlKHZhbHVlKTsKICAgICB9KTsKIAotICAgIFJlZkNvdW50ZWRPYmplY3Q6OnNf dG90YWxSZWZDb3VudCA9IDA7Ci0gICAgYXV0byBtYXBwZWQgPSBXVEY6OmNvbXBhY3RNYXAoV1RG TW92ZShjb3VudGVkT2JqZWN0cyksIFtdKFJlZjxSZWZDb3VudGVkT2JqZWN0PiYmIG9iamVjdCkg LT4gUmVmUHRyPFJlZkNvdW50ZWRPYmplY3Q+IHsKKyAgICBhdXRvIGZ1bmN0aW9uID0gW10oUmVm PFJlZkNvdW50ZWRPYmplY3Q+JiYgb2JqZWN0KSAtPiBSZWZQdHI8UmVmQ291bnRlZE9iamVjdD4g ewogICAgICAgICBpZiAob2JqZWN0LT52YWx1ZSAlIDMpCiAgICAgICAgICAgICByZXR1cm4gbnVs bHB0cjsKICAgICAgICAgcmV0dXJuIFdURk1vdmUob2JqZWN0KTsKLSAgICB9KTsKKyAgICB9Owor CisgICAgUmVmQ291bnRlZE9iamVjdDo6c190b3RhbFJlZkNvdW50ID0gMDsKKyAgICBzdGF0aWNf YXNzZXJ0KHN0ZDo6aXNfc2FtZTxkZWNsdHlwZShXVEY6OmNvbXBhY3RNYXAoV1RGTW92ZShjb3Vu dGVkT2JqZWN0cyksIGZ1bmN0aW9uKSksIHR5cGVuYW1lIFdURjo6VmVjdG9yPFJlZjxSZWZDb3Vu dGVkT2JqZWN0Pj4+Ojp2YWx1ZSwKKyAgICAgICAgIldURjo6Y29tcGFjdE1hcCByZXR1cm5zIFZl Y3RvcjxSZWY8UmVmQ291bnRlZE9iamVjdD4+IHdoZW4gdGhlIGxhbWJkYSByZXR1cm5zIFJlZlB0 cjxSZWZDb3VudGVkT2JqZWN0PiIpOworICAgIGF1dG8gbWFwcGVkID0gV1RGOjpjb21wYWN0TWFw KFdURk1vdmUoY291bnRlZE9iamVjdHMpLCBmdW5jdGlvbik7CiAKICAgICBFWFBFQ1RfRVEoMFUs IFJlZkNvdW50ZWRPYmplY3Q6OnNfdG90YWxSZWZDb3VudCk7CiAgICAgRVhQRUNUX0VRKDNVLCBt YXBwZWQuc2l6ZSgpKTsKQEAgLTExMDEsMTMgKzExMjgsMTcgQEAgVEVTVChXVEZfVmVjdG9yLCBD b21wYWN0TWFwTGFtYmRhUmV0dXJuT3B0aW9uYWxSZWZQdHIpCiAKICAgICBSZWZDb3VudGVkT2Jq ZWN0OjpzX3RvdGFsUmVmQ291bnQgPSAwOwogCi0gICAgVmVjdG9yPFJlZlB0cjxSZWZDb3VudGVk T2JqZWN0Pj4gbWFwcGVkID0gV1RGOjpjb21wYWN0TWFwKHZlY3RvciwgWyZdKGludCB2YWx1ZSkg LT4gT3B0aW9uYWw8UmVmUHRyPFJlZkNvdW50ZWRPYmplY3Q+PiB7CisgICAgYXV0byBmdW5jdGlv biA9IFsmXShpbnQgdmFsdWUpIC0+IE9wdGlvbmFsPFJlZlB0cjxSZWZDb3VudGVkT2JqZWN0Pj4g ewogICAgICAgICBpZiAoISh2YWx1ZSAlIDIpKQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVs bG9wdDsKICAgICAgICAgaWYgKCEodmFsdWUgJSAzKSkKICAgICAgICAgICAgIHJldHVybiBSZWZQ dHI8UmVmQ291bnRlZE9iamVjdD4oKTsKICAgICAgICAgcmV0dXJuIFJlZlB0cjxSZWZDb3VudGVk T2JqZWN0PihSZWZDb3VudGVkT2JqZWN0OjpjcmVhdGUodmFsdWUpKTsKLSAgICB9KTsKKyAgICB9 OworCisgICAgc3RhdGljX2Fzc2VydChzdGQ6OmlzX3NhbWU8ZGVjbHR5cGUoV1RGOjpjb21wYWN0 TWFwKHZlY3RvciwgZnVuY3Rpb24pKSwgdHlwZW5hbWUgV1RGOjpWZWN0b3I8UmVmUHRyPFJlZkNv dW50ZWRPYmplY3Q+Pj46OnZhbHVlLAorICAgICAgICAiV1RGOjpjb21wYWN0TWFwIHJldHVybnMg VmVjdG9yPFJlZlB0cjxSZWZDb3VudGVkT2JqZWN0Pj4gd2hlbiB0aGUgbGFtYmRhIHJldHVybnMg T3B0aW9uYWw8UmVmUHRyPFJlZkNvdW50ZWRPYmplY3Q+PiIpOworICAgIFZlY3RvcjxSZWZQdHI8 UmVmQ291bnRlZE9iamVjdD4+IG1hcHBlZCA9IFdURjo6Y29tcGFjdE1hcCh2ZWN0b3IsIGZ1bmN0 aW9uKTsKIAogICAgIEVYUEVDVF9FUSgwVSwgUmVmQ291bnRlZE9iamVjdDo6c190b3RhbFJlZkNv dW50KTsKICAgICBFWFBFQ1RfRVEoNVUsIG1hcHBlZC5zaXplKCkpOwo=