215984 2020-08-30 00:01:00 -0700 [JSC] Use -2 for grouping options in IntlRelativeTimeFormat 2020-09-14 19:50:42 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 213425 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam tzagallo webkit-bug-importer oldest_to_newest 1683982 0 ysuzuki 2020-08-30 00:01:00 -0700 [JSC] Use -2 for grouping options in IntlRelativeTimeFormat 1683983 1 407563 ysuzuki 2020-08-30 00:03:08 -0700 Created attachment 407563 Patch 1683984 2 407563 ross.kirsling 2020-08-30 00:57:44 -0700 Comment on attachment 407563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407563&action=review > Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp:150 > + // Align to IntlNumberFormat's default. > + unum_setAttribute(m_numberFormat.get(), UNUM_MIN_INTEGER_DIGITS, 1); > + unum_setAttribute(m_numberFormat.get(), UNUM_MIN_FRACTION_DIGITS, 0); > + unum_setAttribute(m_numberFormat.get(), UNUM_MAX_FRACTION_DIGITS, 3); > + unum_setAttribute(m_numberFormat.get(), UNUM_GROUPING_USED, true); Do these need to be set explicitly? 1683985 3 407563 ysuzuki 2020-08-30 01:04:49 -0700 Comment on attachment 407563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407563&action=review >> Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp:150 >> + unum_setAttribute(m_numberFormat.get(), UNUM_GROUPING_USED, true); > > Do these need to be set explicitly? Currently, setting these options to align well to the spec (https://tc39.es/ecma402/#sec-InitializeRelativeTimeFormat uses Intl.NumberFormat). I think this is safer, because ICU could change default values. 1683992 4 407563 ross.kirsling 2020-08-30 01:30:30 -0700 Comment on attachment 407563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407563&action=review > Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp:162 > + unum_setAttribute(m_numberFormat.get(), UNUM_GROUPING_SIZE, useLocaleDefault); > + unum_setAttribute(m_numberFormat.get(), UNUM_SECONDARY_GROUPING_SIZE, useLocaleDefault); Er wait, one more question. Does that enum value really apply to these two attributes as well? It's not very clear from the linked ICU commit. 1683993 5 407563 ysuzuki 2020-08-30 01:36:13 -0700 Comment on attachment 407563 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=407563&action=review >> Source/JavaScriptCore/runtime/IntlRelativeTimeFormat.cpp:162 >> + unum_setAttribute(m_numberFormat.get(), UNUM_SECONDARY_GROUPING_SIZE, useLocaleDefault); > > Er wait, one more question. Does that enum value really apply to these two attributes as well? It's not very clear from the linked ICU commit. Yes, all three are required. See ICU code for fGrouping1, fGrouping2, and fMinGrouping. 1684041 6 407576 ysuzuki 2020-08-30 15:46:35 -0700 Created attachment 407576 Patch Patch for landing 1684057 7 ews-feeder 2020-08-30 18:12:46 -0700 ChangeLog entry in JSTests/ChangeLog contains OOPS!. 1684064 8 ysuzuki 2020-08-30 18:29:17 -0700 Committed r266341: <https://trac.webkit.org/changeset/266341> 1684065 9 webkit-bug-importer 2020-08-30 18:30:16 -0700 <rdar://problem/68046059> 407563 2020-08-30 00:03:08 -0700 2020-08-30 01:24:31 -0700 Patch bug-215984-20200830000307.patch text/plain 3845 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MzI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 NWI2OTk1M2VjZTZiYTM3MzY5YTE3ZWNkNmMxNTZhZTMxOGVmZWRkLi40YTQzNzY1MzJkY2Y0NThm MzE5MjU1YWI1MDU2MjNiZTYzYzAzMzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMC0wOC0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFVzZSAtMiBmb3IgZ3JvdXBpbmcgb3B0aW9ucyBpbiBJbnRsUmVs YXRpdmVUaW1lRm9ybWF0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTU5ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBTZXZlcmFsIHRlc3QyNjIgdGVzdHMgYXJlIGZhaWxpbmcgYWZ0ZXIgSUNVIDY3LiBU aGlzIGlzIGJlY2F1c2UgSW50bC5SZWxhdGl2ZVRpbWVGb3JtYXQgaXMgbm90IHVzaW5nIGxvY2Fs ZS1zZW5zaXRpdmUgZ3JvdXBpbmcgb3B0aW9uLgorICAgICAgICBUaGVyZSBhcmUgaGlkZGVuIG9w dGlvbiAtMiBmb3IgVU51bWJlckZvcm1hdC4gSXQgaXMgc3VwcG9ydGVkIHNvIGxvbmcsIGJ1dCBp dCBpcyBub3QgZXhwbGljaXRseSBkb2N1bWVudGVkLiBBZnRlciBJQ1UgNjgsIGl0IGlzIGV4cG9z ZWQgYXMgYSBjb25zdGFudCwKKyAgICAgICAgd2Ugc2hvdWxkIHBhc3MgLTIgdG8gVU51bWJlckZv cm1hdCdzIGdyb3VwaW5nIG9wdGlvbnMgdG8gdXNlIGxvY2FsZS1zZW5zaXRpdmUgZ3JvdXBpbmcg b3B0aW9uIGhlcmUuCisKKyAgICAgICAgKiBydW50aW1lL0ludGxSZWxhdGl2ZVRpbWVGb3JtYXQu Y3BwOgorICAgICAgICAoSlNDOjpJbnRsUmVsYXRpdmVUaW1lRm9ybWF0Ojppbml0aWFsaXplUmVs YXRpdmVUaW1lRm9ybWF0KToKKwogMjAyMC0wOC0yOSAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lA YXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIGBsZXQgW2Agc2VxdWVuY2UgY2Fubm90IGFwcGVh ciBpbiBFeHByZXNzaW9uU3RhdGVtZW50IGNvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0ludGxSZWxhdGl2ZVRpbWVGb3JtYXQuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFJlbGF0aXZlVGltZUZvcm1hdC5jcHAKaW5kZXggMTgz MWRlYTY2ODg2NTEzZWUzN2IzNmM0ZmViYTY3NWM5Zjc3ZWRiYS4uZjM5ODQyZjJkZDkxYWZlNTQ5 OTRmZDhlMTc5Y2JkNWZkYWU4M2E2MiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3J1bnRpbWUvSW50bFJlbGF0aXZlVGltZUZvcm1hdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvSW50bFJlbGF0aXZlVGltZUZvcm1hdC5jcHAKQEAgLTE0Myw3ICsxNDMs MzIgQEAgdm9pZCBJbnRsUmVsYXRpdmVUaW1lRm9ybWF0Ojppbml0aWFsaXplUmVsYXRpdmVUaW1l Rm9ybWF0KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWwKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot ICAgIG1fcmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciA9IHN0ZDo6dW5pcXVlX3B0cjxVUmVsYXRp dmVEYXRlVGltZUZvcm1hdHRlciwgVVJlbGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXJEZWxldGVyPih1 cmVsZGF0ZWZtdF9vcGVuKGRhdGFMb2NhbGVXaXRoRXh0ZW5zaW9ucy5kYXRhKCksIG51bGxwdHIs IGljdVN0eWxlLCBVRElTUENUWF9DQVBJVEFMSVpBVElPTl9GT1JfU1RBTkRBTE9ORSwgJnN0YXR1 cykpOworICAgIC8vIEFsaWduIHRvIEludGxOdW1iZXJGb3JtYXQncyBkZWZhdWx0LgorICAgIHVu dW1fc2V0QXR0cmlidXRlKG1fbnVtYmVyRm9ybWF0LmdldCgpLCBVTlVNX01JTl9JTlRFR0VSX0RJ R0lUUywgMSk7CisgICAgdW51bV9zZXRBdHRyaWJ1dGUobV9udW1iZXJGb3JtYXQuZ2V0KCksIFVO VU1fTUlOX0ZSQUNUSU9OX0RJR0lUUywgMCk7CisgICAgdW51bV9zZXRBdHRyaWJ1dGUobV9udW1i ZXJGb3JtYXQuZ2V0KCksIFVOVU1fTUFYX0ZSQUNUSU9OX0RJR0lUUywgMyk7CisgICAgdW51bV9z ZXRBdHRyaWJ1dGUobV9udW1iZXJGb3JtYXQuZ2V0KCksIFVOVU1fR1JPVVBJTkdfVVNFRCwgdHJ1 ZSk7CisKKyAgICAvLyBHcm91cGluZyBhdHRyaWJ1dGVzIGhhdmUgaGlkZGVuIC0yIG9wdGlvbiB3 aGljaCBtYWtlcyBncm91cGluZyBydWxlcyBsb2NhbGUtc2Vuc2l0aXZlLgorICAgIC8vIFdoaWxl IHRoaXMgaXMgc3VwcG9ydGVkIHNvIGxvbmcsIHRoaXMgaXMgbm90IGV4cGxpY2l0bHkgZXhwb3Nl ZCBhcyBBUElzLgorICAgIC8vIEFmdGVyIElDVSA2OCwgaXQgaXMgbm93IGV4cG9zZWQgYXMgVU5V TV9NSU5JTVVNX0dST1VQSU5HX0RJR0lUU19BVVRPLiBCZWZvcmUgSUNVIDY4LCB3ZSBjYW4gZGly ZWN0bHkgdXNlIC0yLgorICAgIC8vIGh0dHBzOi8vdW5pY29kZS1vcmcuYXRsYXNzaWFuLm5ldC9i cm93c2UvSUNVLTIxMTA5CisgICAgLy8gaHR0cHM6Ly9naXRodWIuY29tL3VuaWNvZGUtb3JnL2lj dS9jb21taXQvZTdiZDViMWNlZmE0N2EwNDNhOTcxNGUyMWViOTk0NmRkNTRkNTkzZgorICAgIC8v CisgICAgLy8gVGhlc2Ugb3B0aW9ucyBhcmUgdGVzdGVkIGluIHRlc3QyNjIvdGVzdC9pbnRsNDAy L1JlbGF0aXZlVGltZUZvcm1hdC9wcm90b3R5cGUvZm9ybWF0L3BsLXBsLXN0eWxlLWxvbmcuanMg ZXRjLgorICAgIC8vIGUuZy4gaHR0cHM6Ly9naXRodWIuY29tL3RjMzkvdGVzdDI2Mi9jb21taXQv NzljMTgxOGE2ODEyYTJhNmM0N2UzZTNjNTZiYTlmMmIzZWFmZjRkNQorICAgIGNvbnN0ZXhwciBp bnQzMl90IHVzZUxvY2FsZURlZmF1bHQgPSAtMjsKKyAgICB1bnVtX3NldEF0dHJpYnV0ZShtX251 bWJlckZvcm1hdC5nZXQoKSwgVU5VTV9HUk9VUElOR19TSVpFLCB1c2VMb2NhbGVEZWZhdWx0KTsK KyAgICB1bnVtX3NldEF0dHJpYnV0ZShtX251bWJlckZvcm1hdC5nZXQoKSwgVU5VTV9TRUNPTkRB UllfR1JPVVBJTkdfU0laRSwgdXNlTG9jYWxlRGVmYXVsdCk7CisgICAgdW51bV9zZXRBdHRyaWJ1 dGUobV9udW1iZXJGb3JtYXQuZ2V0KCksIFVOVU1fTUlOSU1VTV9HUk9VUElOR19ESUdJVFMsIHVz ZUxvY2FsZURlZmF1bHQpOworCisgICAgVU51bWJlckZvcm1hdCogY2xvbmVkTnVtYmVyRm9ybWF0 ID0gdW51bV9jbG9uZShtX251bWJlckZvcm1hdC5nZXQoKSwgJnN0YXR1cyk7CisgICAgaWYgKFVO TElLRUxZKFVfRkFJTFVSRShzdGF0dXMpKSkgeworICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9i YWxPYmplY3QsIHNjb3BlLCAiZmFpbGVkIHRvIGluaXRpYWxpemUgUmVsYXRpdmVUaW1lRm9ybWF0 Il9zKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fcmVsYXRpdmVEYXRlVGltZUZv cm1hdHRlciA9IHN0ZDo6dW5pcXVlX3B0cjxVUmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciwgVVJl bGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXJEZWxldGVyPih1cmVsZGF0ZWZtdF9vcGVuKGRhdGFMb2Nh bGVXaXRoRXh0ZW5zaW9ucy5kYXRhKCksIGNsb25lZE51bWJlckZvcm1hdCwgaWN1U3R5bGUsIFVE SVNQQ1RYX0NBUElUQUxJWkFUSU9OX0ZPUl9TVEFOREFMT05FLCAmc3RhdHVzKSk7CiAgICAgaWYg KFVOTElLRUxZKFVfRkFJTFVSRShzdGF0dXMpKSkgewogICAgICAgICB0aHJvd1R5cGVFcnJvcihn bG9iYWxPYmplY3QsIHNjb3BlLCAiZmFpbGVkIHRvIGluaXRpYWxpemUgUmVsYXRpdmVUaW1lRm9y bWF0Il9zKTsKICAgICAgICAgcmV0dXJuOwo= 407576 2020-08-30 15:46:35 -0700 2020-08-30 18:12:47 -0700 Patch bug-215984-20200830154635.patch text/plain 7964 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2MzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 NWI2OTk1M2VjZTZiYTM3MzY5YTE3ZWNkNmMxNTZhZTMxOGVmZWRkLi4wMzVhNTM2MTQ4ZjEwODdj MWQ2NGNhZWRlYTZhNmEzMWM1YzljNjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAyMC0wOC0zMCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIFVzZSAtMiBmb3IgZ3JvdXBpbmcgb3B0aW9ucyBpbiBJbnRsUmVs YXRpdmVUaW1lRm9ybWF0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTU5ODQKKworICAgICAgICBSZXZpZXdlZCBieSBSb3NzIEtpcnNsaW5nLgorCisg ICAgICAgIFNldmVyYWwgdGVzdDI2MiB0ZXN0cyBhcmUgZmFpbGluZyBhZnRlciBJQ1UgNjcuIFRo aXMgaXMgYmVjYXVzZSBJbnRsLlJlbGF0aXZlVGltZUZvcm1hdCBpcyBub3QgdXNpbmcgbG9jYWxl LXNlbnNpdGl2ZSBncm91cGluZyBvcHRpb24uCisgICAgICAgIFRoZXJlIGFyZSBoaWRkZW4gb3B0 aW9uIC0yIGZvciBVTnVtYmVyRm9ybWF0LiBJdCBpcyBzdXBwb3J0ZWQgc28gbG9uZywgYnV0IGl0 IGlzIG5vdCBleHBsaWNpdGx5IGRvY3VtZW50ZWQuIEFmdGVyIElDVSA2OCwgaXQgaXMgZXhwb3Nl ZCBhcyBhIGNvbnN0YW50LAorICAgICAgICB3ZSBzaG91bGQgcGFzcyAtMiB0byBVTnVtYmVyRm9y bWF0J3MgZ3JvdXBpbmcgb3B0aW9ucyB0byB1c2UgbG9jYWxlLXNlbnNpdGl2ZSBncm91cGluZyBv cHRpb24gaGVyZS4KKworICAgICAgICAqIHJ1bnRpbWUvSW50bFJlbGF0aXZlVGltZUZvcm1hdC5j cHA6CisgICAgICAgIChKU0M6OkludGxSZWxhdGl2ZVRpbWVGb3JtYXQ6OmluaXRpYWxpemVSZWxh dGl2ZVRpbWVGb3JtYXQpOgorCiAyMDIwLTA4LTI5ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBh cHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gYGxldCBbYCBzZXF1ZW5jZSBjYW5ub3QgYXBwZWFy IGluIEV4cHJlc3Npb25TdGF0ZW1lbnQgY29udGV4dApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSW50bFJlbGF0aXZlVGltZUZvcm1hdC5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0LmNwcAppbmRleCAxODMx ZGVhNjY4ODY1MTNlZTM3YjM2YzRmZWJhNjc1YzlmNzdlZGJhLi5mMzk4NDJmMmRkOTFhZmU1NDk5 NGZkOGUxNzljYmQ1ZmRhZTgzYTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0LmNwcApAQCAtMTQzLDcgKzE0Mywz MiBAQCB2b2lkIEludGxSZWxhdGl2ZVRpbWVGb3JtYXQ6OmluaXRpYWxpemVSZWxhdGl2ZVRpbWVG b3JtYXQoSlNHbG9iYWxPYmplY3QqIGdsb2JhbAogICAgICAgICByZXR1cm47CiAgICAgfQogCi0g ICAgbV9yZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyID0gc3RkOjp1bmlxdWVfcHRyPFVSZWxhdGl2 ZURhdGVUaW1lRm9ybWF0dGVyLCBVUmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlckRlbGV0ZXI+KHVy ZWxkYXRlZm10X29wZW4oZGF0YUxvY2FsZVdpdGhFeHRlbnNpb25zLmRhdGEoKSwgbnVsbHB0ciwg aWN1U3R5bGUsIFVESVNQQ1RYX0NBUElUQUxJWkFUSU9OX0ZPUl9TVEFOREFMT05FLCAmc3RhdHVz KSk7CisgICAgLy8gQWxpZ24gdG8gSW50bE51bWJlckZvcm1hdCdzIGRlZmF1bHQuCisgICAgdW51 bV9zZXRBdHRyaWJ1dGUobV9udW1iZXJGb3JtYXQuZ2V0KCksIFVOVU1fTUlOX0lOVEVHRVJfRElH SVRTLCAxKTsKKyAgICB1bnVtX3NldEF0dHJpYnV0ZShtX251bWJlckZvcm1hdC5nZXQoKSwgVU5V TV9NSU5fRlJBQ1RJT05fRElHSVRTLCAwKTsKKyAgICB1bnVtX3NldEF0dHJpYnV0ZShtX251bWJl ckZvcm1hdC5nZXQoKSwgVU5VTV9NQVhfRlJBQ1RJT05fRElHSVRTLCAzKTsKKyAgICB1bnVtX3Nl dEF0dHJpYnV0ZShtX251bWJlckZvcm1hdC5nZXQoKSwgVU5VTV9HUk9VUElOR19VU0VELCB0cnVl KTsKKworICAgIC8vIEdyb3VwaW5nIGF0dHJpYnV0ZXMgaGF2ZSBoaWRkZW4gLTIgb3B0aW9uIHdo aWNoIG1ha2VzIGdyb3VwaW5nIHJ1bGVzIGxvY2FsZS1zZW5zaXRpdmUuCisgICAgLy8gV2hpbGUg dGhpcyBpcyBzdXBwb3J0ZWQgc28gbG9uZywgdGhpcyBpcyBub3QgZXhwbGljaXRseSBleHBvc2Vk IGFzIEFQSXMuCisgICAgLy8gQWZ0ZXIgSUNVIDY4LCBpdCBpcyBub3cgZXhwb3NlZCBhcyBVTlVN X01JTklNVU1fR1JPVVBJTkdfRElHSVRTX0FVVE8uIEJlZm9yZSBJQ1UgNjgsIHdlIGNhbiBkaXJl Y3RseSB1c2UgLTIuCisgICAgLy8gaHR0cHM6Ly91bmljb2RlLW9yZy5hdGxhc3NpYW4ubmV0L2Jy b3dzZS9JQ1UtMjExMDkKKyAgICAvLyBodHRwczovL2dpdGh1Yi5jb20vdW5pY29kZS1vcmcvaWN1 L2NvbW1pdC9lN2JkNWIxY2VmYTQ3YTA0M2E5NzE0ZTIxZWI5OTQ2ZGQ1NGQ1OTNmCisgICAgLy8K KyAgICAvLyBUaGVzZSBvcHRpb25zIGFyZSB0ZXN0ZWQgaW4gdGVzdDI2Mi90ZXN0L2ludGw0MDIv UmVsYXRpdmVUaW1lRm9ybWF0L3Byb3RvdHlwZS9mb3JtYXQvcGwtcGwtc3R5bGUtbG9uZy5qcyBl dGMuCisgICAgLy8gZS5nLiBodHRwczovL2dpdGh1Yi5jb20vdGMzOS90ZXN0MjYyL2NvbW1pdC83 OWMxODE4YTY4MTJhMmE2YzQ3ZTNlM2M1NmJhOWYyYjNlYWZmNGQ1CisgICAgY29uc3RleHByIGlu dDMyX3QgdXNlTG9jYWxlRGVmYXVsdCA9IC0yOworICAgIHVudW1fc2V0QXR0cmlidXRlKG1fbnVt YmVyRm9ybWF0LmdldCgpLCBVTlVNX0dST1VQSU5HX1NJWkUsIHVzZUxvY2FsZURlZmF1bHQpOwor ICAgIHVudW1fc2V0QXR0cmlidXRlKG1fbnVtYmVyRm9ybWF0LmdldCgpLCBVTlVNX1NFQ09OREFS WV9HUk9VUElOR19TSVpFLCB1c2VMb2NhbGVEZWZhdWx0KTsKKyAgICB1bnVtX3NldEF0dHJpYnV0 ZShtX251bWJlckZvcm1hdC5nZXQoKSwgVU5VTV9NSU5JTVVNX0dST1VQSU5HX0RJR0lUUywgdXNl TG9jYWxlRGVmYXVsdCk7CisKKyAgICBVTnVtYmVyRm9ybWF0KiBjbG9uZWROdW1iZXJGb3JtYXQg PSB1bnVtX2Nsb25lKG1fbnVtYmVyRm9ybWF0LmdldCgpLCAmc3RhdHVzKTsKKyAgICBpZiAoVU5M SUtFTFkoVV9GQUlMVVJFKHN0YXR1cykpKSB7CisgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2Jh bE9iamVjdCwgc2NvcGUsICJmYWlsZWQgdG8gaW5pdGlhbGl6ZSBSZWxhdGl2ZVRpbWVGb3JtYXQi X3MpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgbV9yZWxhdGl2ZURhdGVUaW1lRm9y bWF0dGVyID0gc3RkOjp1bmlxdWVfcHRyPFVSZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyLCBVUmVs YXRpdmVEYXRlVGltZUZvcm1hdHRlckRlbGV0ZXI+KHVyZWxkYXRlZm10X29wZW4oZGF0YUxvY2Fs ZVdpdGhFeHRlbnNpb25zLmRhdGEoKSwgY2xvbmVkTnVtYmVyRm9ybWF0LCBpY3VTdHlsZSwgVURJ U1BDVFhfQ0FQSVRBTElaQVRJT05fRk9SX1NUQU5EQUxPTkUsICZzdGF0dXMpKTsKICAgICBpZiAo VU5MSUtFTFkoVV9GQUlMVVJFKHN0YXR1cykpKSB7CiAgICAgICAgIHRocm93VHlwZUVycm9yKGds b2JhbE9iamVjdCwgc2NvcGUsICJmYWlsZWQgdG8gaW5pdGlhbGl6ZSBSZWxhdGl2ZVRpbWVGb3Jt YXQiX3MpOwogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5nZUxvZyBi L0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDhhMTU4MzI5ZDYyOGUxOGI2NmI5ODc5ODg1YzQyNzg2 YjFhN2M3YmIuLjkwZDg5YzhlYmYwM2FjMjFlMDAxODI2YjQxYTI3MzYyY2UxYzcwNmYgMTAwNjQ0 Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTIgQEAKKzIwMjAtMDgtMzAgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4K KworICAgICAgICBbSlNDXSBVc2UgLTIgZm9yIGdyb3VwaW5nIG9wdGlvbnMgaW4gSW50bFJlbGF0 aXZlVGltZUZvcm1hdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE1OTg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBzdHJlc3MvaW50bC1yZWxhdGl2ZXRpbWVmb3JtYXQuanM6CisKIDIwMjAtMDgtMjkg IFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBgbGV0 IFtgIHNlcXVlbmNlIGNhbm5vdCBhcHBlYXIgaW4gRXhwcmVzc2lvblN0YXRlbWVudCBjb250ZXh0 CmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9pbnRsLXJlbGF0aXZldGltZWZvcm1hdC5qcyBi L0pTVGVzdHMvc3RyZXNzL2ludGwtcmVsYXRpdmV0aW1lZm9ybWF0LmpzCmluZGV4IGY5MWMxYWJj ZTA1NTA2YTA0ZWYwZjNkZGIzYTcwODUxYjI3YmM5MzQuLjQ1MDI4MmZiOTEzM2JjNzQzM2JlY2Q2 ZjEyZjE2N2VjZDZlMjMyYTggMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL2ludGwtcmVsYXRp dmV0aW1lZm9ybWF0LmpzCisrKyBiL0pTVGVzdHMvc3RyZXNzL2ludGwtcmVsYXRpdmV0aW1lZm9y bWF0LmpzCkBAIC0xNzksMTEgKzE3OSwxMSBAQCBmdW5jdGlvbiBzaG91bGRUaHJvdyhmdW5jLCBl cnJvclR5cGUpIHsKIGZvciAobGV0IHVuaXQgb2YgdW5pdHMpIHsKICAgICBzaG91bGRCZShkZWZh dWx0UlRGLmZvcm1hdCgxMCwgdW5pdCksIGRlZmF1bHRSVEYuZm9ybWF0KDEwLCBgJHt1bml0fXNg KSk7CiAKLSAgICBzaG91bGRCZShkZWZhdWx0UlRGLmZvcm1hdCgxMDAwMC41LCB1bml0KSwgYGlu IDEwLDAwMC41ICR7dW5pdH1zYCk7CisgICAgc2hvdWxkQmUoW2BpbiAxMCwwMDAuNSAke3VuaXR9 c2AsIGBpbiAxMDAwMC41ICR7dW5pdH1zYF0uaW5jbHVkZXMoZGVmYXVsdFJURi5mb3JtYXQoMTAw MDAuNSwgdW5pdCkpLCB0cnVlKTsKICAgICBzaG91bGRCZShkZWZhdWx0UlRGLmZvcm1hdCgxMCwg dW5pdCksIGBpbiAxMCAke3VuaXR9c2ApOwogICAgIHNob3VsZEJlKGRlZmF1bHRSVEYuZm9ybWF0 KDAsIHVuaXQpLCBgaW4gMCAke3VuaXR9c2ApOwogICAgIHNob3VsZEJlKGRlZmF1bHRSVEYuZm9y bWF0KC0xMCwgdW5pdCksIGAxMCAke3VuaXR9cyBhZ29gKTsKLSAgICBzaG91bGRCZShkZWZhdWx0 UlRGLmZvcm1hdCgtMTAwMDAuNSwgdW5pdCksIGAxMCwwMDAuNSAke3VuaXR9cyBhZ29gKTsKKyAg ICBzaG91bGRCZShbYDEwLDAwMC41ICR7dW5pdH1zIGFnb2AsIGAxMDAwMC41ICR7dW5pdH1zIGFn b2BdLmluY2x1ZGVzKGRlZmF1bHRSVEYuZm9ybWF0KC0xMDAwMC41LCB1bml0KSksIHRydWUpOwog CiAgICAgc2hvdWxkQmVGb3JJQ1VWZXJzaW9uKDY0LCBkZWZhdWx0UlRGLmZvcm1hdCgxLCB1bml0 KSwgYGluIDEgJHt1bml0fWApOwogICAgIHNob3VsZEJlRm9ySUNVVmVyc2lvbig2MywgZGVmYXVs dFJURi5mb3JtYXQoLTAsIHVuaXQpLCBgMCAke3VuaXR9cyBhZ29gKTsKQEAgLTIxOSwyOSArMjE5 LDMxIEBAIGZ1bmN0aW9uIHNob3VsZFRocm93KGZ1bmMsIGVycm9yVHlwZSkgewogCiAgICAgY29u c3QgY29uY2F0ZW5hdGVWYWx1ZXMgPSAocGFydHMpID0+IHBhcnRzLm1hcChwYXJ0ID0+IHBhcnQu dmFsdWUpLmpvaW4oJycpOwogCi0gICAgc2hvdWxkQmUoY29uY2F0ZW5hdGVWYWx1ZXMoZGVmYXVs dFJURi5mb3JtYXRUb1BhcnRzKDEwMDAwLjUsIHVuaXQpKSwgYGluIDEwLDAwMC41ICR7dW5pdH1z YCk7CisgICAgc2hvdWxkQmUoW2BpbiAxMCwwMDAuNSAke3VuaXR9c2AsIGBpbiAxMDAwMC41ICR7 dW5pdH1zYF0uaW5jbHVkZXMoY29uY2F0ZW5hdGVWYWx1ZXMoZGVmYXVsdFJURi5mb3JtYXRUb1Bh cnRzKDEwMDAwLjUsIHVuaXQpKSksIHRydWUpOwogICAgIHNob3VsZEJlKGNvbmNhdGVuYXRlVmFs dWVzKGRlZmF1bHRSVEYuZm9ybWF0VG9QYXJ0cygxMCwgdW5pdCkpLCBgaW4gMTAgJHt1bml0fXNg KTsKICAgICBzaG91bGRCZShjb25jYXRlbmF0ZVZhbHVlcyhkZWZhdWx0UlRGLmZvcm1hdFRvUGFy dHMoMCwgdW5pdCkpLCBgaW4gMCAke3VuaXR9c2ApOwogICAgIHNob3VsZEJlKGNvbmNhdGVuYXRl VmFsdWVzKGRlZmF1bHRSVEYuZm9ybWF0VG9QYXJ0cygtMTAsIHVuaXQpKSwgYDEwICR7dW5pdH1z IGFnb2ApOwotICAgIHNob3VsZEJlKGNvbmNhdGVuYXRlVmFsdWVzKGRlZmF1bHRSVEYuZm9ybWF0 VG9QYXJ0cygtMTAwMDAuNSwgdW5pdCkpLCBgMTAsMDAwLjUgJHt1bml0fXMgYWdvYCk7CisgICAg c2hvdWxkQmUoW2AxMCwwMDAuNSAke3VuaXR9cyBhZ29gLCBgMTAwMDAuNSAke3VuaXR9cyBhZ29g XS5pbmNsdWRlcyhjb25jYXRlbmF0ZVZhbHVlcyhkZWZhdWx0UlRGLmZvcm1hdFRvUGFydHMoLTEw MDAwLjUsIHVuaXQpKSksIHRydWUpOwogCiAgICAgc2hvdWxkQmVGb3JJQ1VWZXJzaW9uKDY0LCBj b25jYXRlbmF0ZVZhbHVlcyhkZWZhdWx0UlRGLmZvcm1hdFRvUGFydHMoMSwgdW5pdCkpLCBgaW4g MSAke3VuaXR9YCk7CiAgICAgc2hvdWxkQmVGb3JJQ1VWZXJzaW9uKDYzLCBjb25jYXRlbmF0ZVZh bHVlcyhkZWZhdWx0UlRGLmZvcm1hdFRvUGFydHMoLTAsIHVuaXQpKSwgYDAgJHt1bml0fXMgYWdv YCk7CiAgICAgc2hvdWxkQmVGb3JJQ1VWZXJzaW9uKDY0LCBjb25jYXRlbmF0ZVZhbHVlcyhkZWZh dWx0UlRGLmZvcm1hdFRvUGFydHMoLTEsIHVuaXQpKSwgYDEgJHt1bml0fSBhZ29gKTsKIH0KIAot c2hvdWxkQmUoCi0gICAgSlNPTi5zdHJpbmdpZnkoZGVmYXVsdFJURi5mb3JtYXRUb1BhcnRzKDEw MDAwLjUsICdkYXknKSksCi0gICAgSlNPTi5zdHJpbmdpZnkoWwotICAgICAgICB7IHR5cGU6ICds aXRlcmFsJywgdmFsdWU6ICdpbiAnIH0sCi0gICAgICAgIHsgdHlwZTogJ2ludGVnZXInLCB2YWx1 ZTogJzEwJywgdW5pdDogJ2RheScgfSwKLSAgICAgICAgeyB0eXBlOiAnZ3JvdXAnLCB2YWx1ZTog JywnLCB1bml0OiAnZGF5JyB9LAotICAgICAgICB7IHR5cGU6ICdpbnRlZ2VyJywgdmFsdWU6ICcw MDAnLCB1bml0OiAnZGF5JyB9LAotICAgICAgICB7IHR5cGU6ICdkZWNpbWFsJywgdmFsdWU6ICcu JywgdW5pdDogJ2RheScgfSwKLSAgICAgICAgeyB0eXBlOiAnZnJhY3Rpb24nLCB2YWx1ZTogJzUn LCB1bml0OiAnZGF5JyB9LAotICAgICAgICB7IHR5cGU6ICdsaXRlcmFsJywgdmFsdWU6ICcgZGF5 cycgfQotICAgIF0pCi0pOworaWYgKCR2bS5pY3VWZXJzaW9uKCkgPj0gNjQpIHsKKyAgICBzaG91 bGRCZSgKKyAgICAgICAgSlNPTi5zdHJpbmdpZnkoZGVmYXVsdFJURi5mb3JtYXRUb1BhcnRzKDEw MDAwLjUsICdkYXknKSksCisgICAgICAgIEpTT04uc3RyaW5naWZ5KFsKKyAgICAgICAgICAgIHsg dHlwZTogJ2xpdGVyYWwnLCB2YWx1ZTogJ2luICcgfSwKKyAgICAgICAgICAgIHsgdHlwZTogJ2lu dGVnZXInLCB2YWx1ZTogJzEwJywgdW5pdDogJ2RheScgfSwKKyAgICAgICAgICAgIHsgdHlwZTog J2dyb3VwJywgdmFsdWU6ICcsJywgdW5pdDogJ2RheScgfSwKKyAgICAgICAgICAgIHsgdHlwZTog J2ludGVnZXInLCB2YWx1ZTogJzAwMCcsIHVuaXQ6ICdkYXknIH0sCisgICAgICAgICAgICB7IHR5 cGU6ICdkZWNpbWFsJywgdmFsdWU6ICcuJywgdW5pdDogJ2RheScgfSwKKyAgICAgICAgICAgIHsg dHlwZTogJ2ZyYWN0aW9uJywgdmFsdWU6ICc1JywgdW5pdDogJ2RheScgfSwKKyAgICAgICAgICAg IHsgdHlwZTogJ2xpdGVyYWwnLCB2YWx1ZTogJyBkYXlzJyB9CisgICAgICAgIF0pCisgICAgKTsK K30KIAogc2hvdWxkQmUoCiAgICAgSlNPTi5zdHJpbmdpZnkobmV3IEludGwuUmVsYXRpdmVUaW1l Rm9ybWF0KCdzdycpLmZvcm1hdFRvUGFydHMoMTAsICd5ZWFyJykpLAo=