213587 2020-06-24 19:09:44 -0700 [Intl] Disprefer using ICU enums directly as instance variables 2020-06-25 17:02:00 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling darin ews-watchlist keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1665954 0 ross.kirsling 2020-06-24 19:09:44 -0700 [Intl] Disprefer using ICU enums directly as instance variables 1665955 1 402707 ross.kirsling 2020-06-24 19:11:12 -0700 Created attachment 402707 Patch 1665957 2 ross.kirsling 2020-06-24 19:12:46 -0700 Here's the patch whether we choose to use it or not. Either way, IntlPluralRules is 72 bytes (padding 6 → 9) and IntlRelativeTimeFormat is 56 bytes (padding 3 → 6). 1665959 3 402707 ysuzuki 2020-06-24 19:27:31 -0700 Comment on attachment 402707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402707&action=review r=me > Source/JavaScriptCore/runtime/IntlPluralRules.h:83 > + bool m_isOrdinal { false }; I think `enum class OrdinalType : uint8_t { Ordinal, Cardinal };` would be better. 1665962 4 402708 ross.kirsling 2020-06-24 19:32:50 -0700 Created attachment 402708 Patch for landing 1665973 5 ews-feeder 2020-06-24 20:58:12 -0700 Committed r263497: <https://trac.webkit.org/changeset/263497> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402708. 1666164 6 402707 darin 2020-06-25 12:33:40 -0700 Comment on attachment 402707 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402707&action=review >> Source/JavaScriptCore/runtime/IntlPluralRules.h:83 >> + bool m_isOrdinal { false }; > > I think `enum class OrdinalType : uint8_t { Ordinal, Cardinal };` would be better. Why not "enum class OrdinalType : bool { Cardinal, Ordinal };"? 1666168 7 ross.kirsling 2020-06-25 12:37:16 -0700 (In reply to Darin Adler from comment #6) > Comment on attachment 402707 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=402707&action=review > > >> Source/JavaScriptCore/runtime/IntlPluralRules.h:83 > >> + bool m_isOrdinal { false }; > > > > I think `enum class OrdinalType : uint8_t { Ordinal, Cardinal };` would be better. > > Why not "enum class OrdinalType : bool { Cardinal, Ordinal };"? I landed it as Type : bool. 1666289 8 webkit-bug-importer 2020-06-25 17:02:00 -0700 <rdar://problem/64781188> 402707 2020-06-24 19:11:12 -0700 2020-06-24 19:32:47 -0700 Patch bug-213587-20200624191111.patch text/plain 9269 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh OTEyZWVlNDdiZmNhZDY5Zjk2MGNmZDBjMzliZGY5YTY0ZGU2YTVlLi42M2U1ZTY5OGMxMTczYjc2 MWU1YmY5OWExYTJiZTk3NzQ3MDExN2U3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMC0wNi0yNCAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgW0ludGxdIERpc3ByZWZlciB1c2luZyBJQ1UgZW51bXMgZGlyZWN0 bHkgYXMgaW5zdGFuY2UgdmFyaWFibGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTM1ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHJ1bnRpbWUvSW50bFBsdXJhbFJ1bGVzLmNwcDoKKyAgICAgICAg KEpTQzo6SW50bFBsdXJhbFJ1bGVzOjppbml0aWFsaXplUGx1cmFsUnVsZXMpOgorICAgICAgICAo SlNDOjpJbnRsUGx1cmFsUnVsZXM6OnJlc29sdmVkT3B0aW9ucyBjb25zdCk6CisgICAgICAgICog cnVudGltZS9JbnRsUGx1cmFsUnVsZXMuaDoKKyAgICAgICAgKiBydW50aW1lL0ludGxSZWxhdGl2 ZVRpbWVGb3JtYXQuY3BwOgorICAgICAgICAoSlNDOjpJbnRsUmVsYXRpdmVUaW1lRm9ybWF0Ojpp bml0aWFsaXplUmVsYXRpdmVUaW1lRm9ybWF0KToKKyAgICAgICAgKEpTQzo6SW50bFJlbGF0aXZl VGltZUZvcm1hdDo6c3R5bGVTdHJpbmcpOiBSZW5hbWVkIGZyb20gSlNDOjpzdHlsZVN0cmluZy4K KyAgICAgICAgKEpTQzo6SW50bFJlbGF0aXZlVGltZUZvcm1hdDo6cmVzb2x2ZWRPcHRpb25zIGNv bnN0KToKKyAgICAgICAgKEpTQzo6bnVtZXJpY1N0cmluZyk6IERlbGV0ZWQuCisgICAgICAgICog cnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0Lmg6CisKIDIwMjAtMDYtMjQgIFVtYXIgSXFi YWwgIDx1aXFiYWxAYXBwbGUuY29tPgogCiAgICAgICAgIFdlIHNob3VsZCByZXN1cnJlY3QgdGhl IG9sZGVyIHBhdGNoIHRoYXQgY29sbGVjdHMgc29tZSBzdGF0aXN0aWNzIG9mIHdlYiBBUEkgY2Fs bHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxQbHVyYWxS dWxlcy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUGx1cmFsUnVsZXMu Y3BwCmluZGV4IDYxNmU1MmVkOGU1ZjkyOTE2ZDRmNjgzMTM3ZmNmYmM3MjAwMGM1ZjcuLjE3NzVk ZmIxZjdlODE4NzEzMTdkOGZmMTFhODU1Y2ZhN2MxOTZkMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxQbHVyYWxSdWxlcy5jcHAKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFBsdXJhbFJ1bGVzLmNwcApAQCAtMTIzLDcgKzEyMyw3 IEBAIHZvaWQgSW50bFBsdXJhbFJ1bGVzOjppbml0aWFsaXplUGx1cmFsUnVsZXMoSlNHbG9iYWxP YmplY3QqIGdsb2JhbE9iamVjdCwgSlNWYWx1CiAKICAgICBTdHJpbmcgdHlwZVN0cmluZyA9IGlu dGxTdHJpbmdPcHRpb24oZ2xvYmFsT2JqZWN0LCBvcHRpb25zLCB2bS5wcm9wZXJ0eU5hbWVzLT50 eXBlLCB7ICJjYXJkaW5hbCIsICJvcmRpbmFsIiB9LCAidHlwZSBtdXN0IGJlIFwiY2FyZGluYWxc IiBvciBcIm9yZGluYWxcIiIsICJjYXJkaW5hbCIpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04o c2NvcGUsIHZvaWQoKSk7Ci0gICAgbV90eXBlID0gdHlwZVN0cmluZyA9PSAib3JkaW5hbCIgPyBV UExVUkFMX1RZUEVfT1JESU5BTCA6IFVQTFVSQUxfVFlQRV9DQVJESU5BTDsKKyAgICBtX2lzT3Jk aW5hbCA9ICh0eXBlU3RyaW5nID09ICJvcmRpbmFsIik7CiAKICAgICB1bnNpZ25lZCBtaW5pbXVt SW50ZWdlckRpZ2l0cyA9IGludGxOdW1iZXJPcHRpb24oZ2xvYmFsT2JqZWN0LCBvcHRpb25zLCBJ ZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAibWluaW11bUludGVnZXJEaWdpdHMiKSwgMSwgMjEs IDEpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7CkBAIC0xNzIsNyAr MTcyLDcgQEAgdm9pZCBJbnRsUGx1cmFsUnVsZXM6OmluaXRpYWxpemVQbHVyYWxSdWxlcyhKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHUKICAgICB9CiAKICAgICBzdGF0dXMgPSBV X1pFUk9fRVJST1I7Ci0gICAgbV9wbHVyYWxSdWxlcyA9IHN0ZDo6dW5pcXVlX3B0cjxVUGx1cmFs UnVsZXMsIFVQbHVyYWxSdWxlc0RlbGV0ZXI+KHVwbHJ1bGVzX29wZW5Gb3JUeXBlKG1fbG9jYWxl LnV0ZjgoKS5kYXRhKCksIG1fdHlwZSwgJnN0YXR1cykpOworICAgIG1fcGx1cmFsUnVsZXMgPSBz dGQ6OnVuaXF1ZV9wdHI8VVBsdXJhbFJ1bGVzLCBVUGx1cmFsUnVsZXNEZWxldGVyPih1cGxydWxl c19vcGVuRm9yVHlwZShtX2xvY2FsZS51dGY4KCkuZGF0YSgpLCBtX2lzT3JkaW5hbCA/IFVQTFVS QUxfVFlQRV9PUkRJTkFMIDogVVBMVVJBTF9UWVBFX0NBUkRJTkFMLCAmc3RhdHVzKSk7CiAgICAg aWYgKFVfRkFJTFVSRShzdGF0dXMpKSB7CiAgICAgICAgIHRocm93VHlwZUVycm9yKGdsb2JhbE9i amVjdCwgc2NvcGUsICJmYWlsZWQgdG8gaW5pdGlhbGl6ZSBQbHVyYWxSdWxlcyJfcyk7CiAgICAg ICAgIHJldHVybjsKQEAgLTE4OSw3ICsxODksNyBAQCBKU09iamVjdCogSW50bFBsdXJhbFJ1bGVz OjpyZXNvbHZlZE9wdGlvbnMoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCkgY29uc3QKIAog ICAgIEpTT2JqZWN0KiBvcHRpb25zID0gY29uc3RydWN0RW1wdHlPYmplY3QoZ2xvYmFsT2JqZWN0 KTsKICAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmxvY2FsZSwg anNOb250cml2aWFsU3RyaW5nKHZtLCBtX2xvY2FsZSkpOwotICAgIG9wdGlvbnMtPnB1dERpcmVj dCh2bSwgdm0ucHJvcGVydHlOYW1lcy0+dHlwZSwganNOb250cml2aWFsU3RyaW5nKHZtLCBtX3R5 cGUgPT0gVVBMVVJBTF9UWVBFX09SRElOQUwgPyAib3JkaW5hbCJfcyA6ICJjYXJkaW5hbCJfcykp OworICAgIG9wdGlvbnMtPnB1dERpcmVjdCh2bSwgdm0ucHJvcGVydHlOYW1lcy0+dHlwZSwganNO b250cml2aWFsU3RyaW5nKHZtLCBtX2lzT3JkaW5hbCA/ICJvcmRpbmFsIl9zIDogImNhcmRpbmFs Il9zKSk7CiAgICAgb3B0aW9ucy0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5n KHZtLCAibWluaW11bUludGVnZXJEaWdpdHMiKSwganNOdW1iZXIobV9taW5pbXVtSW50ZWdlckRp Z2l0cykpOwogICAgIG9wdGlvbnMtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmlu Zyh2bSwgIm1pbmltdW1GcmFjdGlvbkRpZ2l0cyIpLCBqc051bWJlcihtX21pbmltdW1GcmFjdGlv bkRpZ2l0cykpOwogICAgIG9wdGlvbnMtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0 cmluZyh2bSwgIm1heGltdW1GcmFjdGlvbkRpZ2l0cyIpLCBqc051bWJlcihtX21heGltdW1GcmFj dGlvbkRpZ2l0cykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv SW50bFBsdXJhbFJ1bGVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUGx1 cmFsUnVsZXMuaAppbmRleCBkMzcxMjczNmZhZmIyYTIxYTJhNjdjYWJlNGZhMTg1YmQ3ZTA1ZTFk Li4xZDE3YjU1NDMyNzM1NGVlZmFmZGIzZGFjMjk0MjdkNGI4N2YyMzYzIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUGx1cmFsUnVsZXMuaAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUGx1cmFsUnVsZXMuaApAQCAtNzUsMTIgKzc1 LDEyIEBAIHByaXZhdGU6CiAgICAgc3RkOjp1bmlxdWVfcHRyPFVOdW1iZXJGb3JtYXQsIFVOdW1i ZXJGb3JtYXREZWxldGVyPiBtX251bWJlckZvcm1hdDsKIAogICAgIFN0cmluZyBtX2xvY2FsZTsK LSAgICBVUGx1cmFsVHlwZSBtX3R5cGUgeyBVUExVUkFMX1RZUEVfQ0FSRElOQUwgfTsKICAgICB1 bnNpZ25lZCBtX21pbmltdW1JbnRlZ2VyRGlnaXRzIHsgMSB9OwogICAgIHVuc2lnbmVkIG1fbWlu aW11bUZyYWN0aW9uRGlnaXRzIHsgMCB9OwogICAgIHVuc2lnbmVkIG1fbWF4aW11bUZyYWN0aW9u RGlnaXRzIHsgMyB9OwogICAgIE9wdGlvbmFsPHVuc2lnbmVkPiBtX21pbmltdW1TaWduaWZpY2Fu dERpZ2l0czsKICAgICBPcHRpb25hbDx1bnNpZ25lZD4gbV9tYXhpbXVtU2lnbmlmaWNhbnREaWdp dHM7CisgICAgYm9vbCBtX2lzT3JkaW5hbCB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBKU0MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxSZWxh dGl2ZVRpbWVGb3JtYXQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFJl bGF0aXZlVGltZUZvcm1hdC5jcHAKaW5kZXggMzA5MzgwOWJkN2ViMDVkNzkxNDY4ZDU5NjQ2MzA2 NGUyMWVjMTk4OC4uOTFiMWJmYTE0MjU4OTFmN2MzYzg1NDRhMmI3NDk4MDMwZjdjNDZlNyAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFJlbGF0aXZlVGltZUZv cm1hdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFJlbGF0aXZl VGltZUZvcm1hdC5jcHAKQEAgLTEzNSwxNCArMTM1LDE4IEBAIHZvaWQgSW50bFJlbGF0aXZlVGlt ZUZvcm1hdDo6aW5pdGlhbGl6ZVJlbGF0aXZlVGltZUZvcm1hdChKU0dsb2JhbE9iamVjdCogZ2xv YmFsCiAKICAgICBTdHJpbmcgc3R5bGUgPSBpbnRsU3RyaW5nT3B0aW9uKGdsb2JhbE9iamVjdCwg b3B0aW9ucywgdm0ucHJvcGVydHlOYW1lcy0+c3R5bGUsIHsgImxvbmciLCAic2hvcnQiLCAibmFy cm93IiB9LCAic3R5bGUgbXVzdCBiZSBlaXRoZXIgXCJsb25nXCIsIFwic2hvcnRcIiwgb3IgXCJu YXJyb3dcIiIsICJsb25nIik7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgp KTsKLSAgICBpZiAoc3R5bGUgPT0gImxvbmciKQotICAgICAgICBtX3N0eWxlID0gVURBVF9TVFlM RV9MT05HOwotICAgIGVsc2UgaWYgKHN0eWxlID09ICJzaG9ydCIpCi0gICAgICAgIG1fc3R5bGUg PSBVREFUX1NUWUxFX1NIT1JUOwotICAgIGVsc2UgaWYgKHN0eWxlID09ICJuYXJyb3ciKQotICAg ICAgICBtX3N0eWxlID0gVURBVF9TVFlMRV9OQVJST1c7Ci0gICAgZWxzZQotICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICBVRGF0ZVJlbGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXJTdHls ZSBpY3VTdHlsZTsKKyAgICBpZiAoc3R5bGUgPT0gImxvbmciKSB7CisgICAgICAgIGljdVN0eWxl ID0gVURBVF9TVFlMRV9MT05HOworICAgICAgICBtX3N0eWxlID0gU3R5bGU6Okxvbmc7CisgICAg fSBlbHNlIGlmIChzdHlsZSA9PSAic2hvcnQiKSB7CisgICAgICAgIGljdVN0eWxlID0gVURBVF9T VFlMRV9TSE9SVDsKKyAgICAgICAgbV9zdHlsZSA9IFN0eWxlOjpTaG9ydDsKKyAgICB9IGVsc2Ug eworICAgICAgICBBU1NFUlQoc3R5bGUgPT0gIm5hcnJvdyIpOworICAgICAgICBpY3VTdHlsZSA9 IFVEQVRfU1RZTEVfTkFSUk9XOworICAgICAgICBtX3N0eWxlID0gU3R5bGU6Ok5hcnJvdzsKKyAg ICB9CiAKICAgICBTdHJpbmcgbnVtZXJpYyA9IGludGxTdHJpbmdPcHRpb24oZ2xvYmFsT2JqZWN0 LCBvcHRpb25zLCB2bS5wcm9wZXJ0eU5hbWVzLT5udW1lcmljLCB7ICJhbHdheXMiLCAiYXV0byIg fSwgIm51bWVyaWMgbXVzdCBiZSBlaXRoZXIgXCJhbHdheXNcIiBvciBcImF1dG9cIiIsICJhbHdh eXMiKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwpAQCAtMTU1LDMy ICsxNTksMjcgQEAgdm9pZCBJbnRsUmVsYXRpdmVUaW1lRm9ybWF0Ojppbml0aWFsaXplUmVsYXRp dmVUaW1lRm9ybWF0KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWwKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAotICAgIG1fcmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciA9IHN0ZDo6dW5pcXVlX3B0cjxV UmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciwgVVJlbGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXJEZWxl dGVyPih1cmVsZGF0ZWZtdF9vcGVuKGRhdGFMb2NhbGVXaXRoRXh0ZW5zaW9ucy5kYXRhKCksIG51 bGxwdHIsIG1fc3R5bGUsIFVESVNQQ1RYX0NBUElUQUxJWkFUSU9OX0ZPUl9TVEFOREFMT05FLCAm c3RhdHVzKSk7CisgICAgbV9yZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyID0gc3RkOjp1bmlxdWVf cHRyPFVSZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyLCBVUmVsYXRpdmVEYXRlVGltZUZvcm1hdHRl ckRlbGV0ZXI+KHVyZWxkYXRlZm10X29wZW4oZGF0YUxvY2FsZVdpdGhFeHRlbnNpb25zLmRhdGEo KSwgbnVsbHB0ciwgaWN1U3R5bGUsIFVESVNQQ1RYX0NBUElUQUxJWkFUSU9OX0ZPUl9TVEFOREFM T05FLCAmc3RhdHVzKSk7CiAgICAgaWYgKFVOTElLRUxZKFVfRkFJTFVSRShzdGF0dXMpKSkgewog ICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiZmFpbGVkIHRvIGlu aXRpYWxpemUgUmVsYXRpdmVUaW1lRm9ybWF0Il9zKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K IH0KIAotc3RhdGljIEFTQ0lJTGl0ZXJhbCBzdHlsZVN0cmluZyhVRGF0ZVJlbGF0aXZlRGF0ZVRp bWVGb3JtYXR0ZXJTdHlsZSBzdHlsZSkKK0FTQ0lJTGl0ZXJhbCBJbnRsUmVsYXRpdmVUaW1lRm9y bWF0OjpzdHlsZVN0cmluZyhTdHlsZSBzdHlsZSkKIHsKICAgICBzd2l0Y2ggKHN0eWxlKSB7Ci0g ICAgY2FzZSBVREFUX1NUWUxFX0xPTkc6CisgICAgY2FzZSBTdHlsZTo6TG9uZzoKICAgICAgICAg cmV0dXJuICJsb25nIl9zOwotICAgIGNhc2UgVURBVF9TVFlMRV9TSE9SVDoKKyAgICBjYXNlIFN0 eWxlOjpTaG9ydDoKICAgICAgICAgcmV0dXJuICJzaG9ydCJfczsKLSAgICBjYXNlIFVEQVRfU1RZ TEVfTkFSUk9XOgorICAgIGNhc2UgU3R5bGU6Ok5hcnJvdzoKICAgICAgICAgcmV0dXJuICJuYXJy b3ciX3M7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBBU0NJ SUxpdGVyYWw6Om51bGwoKTsKIH0KIAotc3RhdGljIEFTQ0lJTGl0ZXJhbCBudW1lcmljU3RyaW5n KGJvb2wgbnVtZXJpYykKLXsKLSAgICByZXR1cm4gbnVtZXJpYyA/ICJhbHdheXMiX3MgOiAiYXV0 byJfczsKLX0KLQogLy8gaHR0cHM6Ly90YzM5LmVzL2VjbWE0MDIvI3NlYy1pbnRsLnJlbGF0aXZl dGltZWZvcm1hdC5wcm90b3R5cGUucmVzb2x2ZWRvcHRpb25zCiBKU09iamVjdCogSW50bFJlbGF0 aXZlVGltZUZvcm1hdDo6cmVzb2x2ZWRPcHRpb25zKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmpl Y3QpIGNvbnN0CiB7CkBAIC0xODgsNyArMTg3LDcgQEAgSlNPYmplY3QqIEludGxSZWxhdGl2ZVRp bWVGb3JtYXQ6OnJlc29sdmVkT3B0aW9ucyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQog ICAgIEpTT2JqZWN0KiBvcHRpb25zID0gY29uc3RydWN0RW1wdHlPYmplY3QoZ2xvYmFsT2JqZWN0 KTsKICAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmxvY2FsZSwg anNOb250cml2aWFsU3RyaW5nKHZtLCBtX2xvY2FsZSkpOwogICAgIG9wdGlvbnMtPnB1dERpcmVj dCh2bSwgdm0ucHJvcGVydHlOYW1lcy0+c3R5bGUsIGpzTm9udHJpdmlhbFN0cmluZyh2bSwgc3R5 bGVTdHJpbmcobV9zdHlsZSkpKTsKLSAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIHZtLnByb3Bl cnR5TmFtZXMtPm51bWVyaWMsIGpzTm9udHJpdmlhbFN0cmluZyh2bSwgbnVtZXJpY1N0cmluZyht X251bWVyaWMpKSk7CisgICAgb3B0aW9ucy0+cHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVz LT5udW1lcmljLCBqc05vbnRyaXZpYWxTdHJpbmcodm0sIG1fbnVtZXJpYyA/ICJhbHdheXMiX3Mg OiAiYXV0byJfcykpOwogICAgIG9wdGlvbnMtPnB1dERpcmVjdCh2bSwgdm0ucHJvcGVydHlOYW1l cy0+bnVtYmVyaW5nU3lzdGVtLCBqc05vbnRyaXZpYWxTdHJpbmcodm0sIG1fbnVtYmVyaW5nU3lz dGVtKSk7CiAgICAgcmV0dXJuIG9wdGlvbnM7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0LmggYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0LmgKaW5kZXggMDg0N2I1ZTgz M2MyZWIwN2VmMDQzYTQ4YzRhMTRhNjI5YmNhYTg2OC4uODViODFmYTgzOGQzNWVmMzNlZTljMGFl NmE1MDI3MGQxNmY4NTVkYSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSW50bFJlbGF0aXZlVGltZUZvcm1hdC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0ludGxSZWxhdGl2ZVRpbWVGb3JtYXQuaApAQCAtNjYsNiArNjYsOCBAQCBwcml2YXRl OgogCiAgICAgU3RyaW5nIGZvcm1hdEludGVybmFsKEpTR2xvYmFsT2JqZWN0KiwgZG91YmxlLCBT dHJpbmdWaWV3IHVuaXQpIGNvbnN0OwogCisgICAgZW51bSBjbGFzcyBTdHlsZSA6IHVpbnQ4X3Qg eyBMb25nLCBTaG9ydCwgTmFycm93IH07CisKICAgICBzdHJ1Y3QgVVJlbGF0aXZlRGF0ZVRpbWVG b3JtYXR0ZXJEZWxldGVyIHsKICAgICAgICAgdm9pZCBvcGVyYXRvcigpKFVSZWxhdGl2ZURhdGVU aW1lRm9ybWF0dGVyKikgY29uc3Q7CiAgICAgfTsKQEAgLTczLDEyICs3NSwxNCBAQCBwcml2YXRl OgogICAgICAgICB2b2lkIG9wZXJhdG9yKCkoVU51bWJlckZvcm1hdCopIGNvbnN0OwogICAgIH07 CiAKKyAgICBzdGF0aWMgQVNDSUlMaXRlcmFsIHN0eWxlU3RyaW5nKFN0eWxlKTsKKwogICAgIHN0 ZDo6dW5pcXVlX3B0cjxVUmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciwgVVJlbGF0aXZlRGF0ZVRp bWVGb3JtYXR0ZXJEZWxldGVyPiBtX3JlbGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXI7CiAgICAgc3Rk Ojp1bmlxdWVfcHRyPFVOdW1iZXJGb3JtYXQsIFVOdW1iZXJGb3JtYXREZWxldGVyPiBtX251bWJl ckZvcm1hdDsKIAogICAgIFN0cmluZyBtX2xvY2FsZTsKICAgICBTdHJpbmcgbV9udW1iZXJpbmdT eXN0ZW07Ci0gICAgVURhdGVSZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyU3R5bGUgbV9zdHlsZSB7 IFVEQVRfU1RZTEVfTE9ORyB9OworICAgIFN0eWxlIG1fc3R5bGUgeyBTdHlsZTo6TG9uZyB9Owog ICAgIGJvb2wgbV9udW1lcmljIHsgdHJ1ZSB9OwogfTsKIAo= 402708 2020-06-24 19:32:50 -0700 2020-06-24 20:58:12 -0700 Patch for landing bug-213587-20200624193249.patch text/plain 9557 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNDc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh OTEyZWVlNDdiZmNhZDY5Zjk2MGNmZDBjMzliZGY5YTY0ZGU2YTVlLi5lYWFkZjFmNGI3ZjVmMDAw YTZlZDlhNTA5YTEzYmQ3ZDM3NWFjODA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAyMC0wNi0yNCAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgW0ludGxdIERpc3ByZWZlciB1c2luZyBJQ1UgZW51bXMgZGlyZWN0 bHkgYXMgaW5zdGFuY2UgdmFyaWFibGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTM1ODcKKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6 dWtpLgorCisgICAgICAgICogcnVudGltZS9JbnRsUGx1cmFsUnVsZXMuY3BwOgorICAgICAgICAo SlNDOjpJbnRsUGx1cmFsUnVsZXM6OmluaXRpYWxpemVQbHVyYWxSdWxlcyk6CisgICAgICAgIChK U0M6OkludGxQbHVyYWxSdWxlczo6cmVzb2x2ZWRPcHRpb25zIGNvbnN0KToKKyAgICAgICAgKiBy dW50aW1lL0ludGxQbHVyYWxSdWxlcy5oOgorICAgICAgICAqIHJ1bnRpbWUvSW50bFJlbGF0aXZl VGltZUZvcm1hdC5jcHA6CisgICAgICAgIChKU0M6OkludGxSZWxhdGl2ZVRpbWVGb3JtYXQ6Omlu aXRpYWxpemVSZWxhdGl2ZVRpbWVGb3JtYXQpOgorICAgICAgICAoSlNDOjpJbnRsUmVsYXRpdmVU aW1lRm9ybWF0OjpzdHlsZVN0cmluZyk6IFJlbmFtZWQgZnJvbSBKU0M6OnN0eWxlU3RyaW5nLgor ICAgICAgICAoSlNDOjpJbnRsUmVsYXRpdmVUaW1lRm9ybWF0OjpyZXNvbHZlZE9wdGlvbnMgY29u c3QpOgorICAgICAgICAoSlNDOjpudW1lcmljU3RyaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKiBy dW50aW1lL0ludGxSZWxhdGl2ZVRpbWVGb3JtYXQuaDoKKwogMjAyMC0wNi0yNCAgVW1hciBJcWJh bCAgPHVpcWJhbEBhcHBsZS5jb20+CiAKICAgICAgICAgV2Ugc2hvdWxkIHJlc3VycmVjdCB0aGUg b2xkZXIgcGF0Y2ggdGhhdCBjb2xsZWN0cyBzb21lIHN0YXRpc3RpY3Mgb2Ygd2ViIEFQSSBjYWxs cwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFBsdXJhbFJ1 bGVzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxQbHVyYWxSdWxlcy5j cHAKaW5kZXggNjE2ZTUyZWQ4ZTVmOTI5MTZkNGY2ODMxMzdmY2ZiYzcyMDAwYzVmNy4uYzQ5OWFk YTE5ZjNhZDRjMmY4MzBhZGMzYzUzYjhkNWE2YzFmNTc2ZiAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFBsdXJhbFJ1bGVzLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUGx1cmFsUnVsZXMuY3BwCkBAIC0xMjMsNyArMTIzLDcg QEAgdm9pZCBJbnRsUGx1cmFsUnVsZXM6OmluaXRpYWxpemVQbHVyYWxSdWxlcyhKU0dsb2JhbE9i amVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHUKIAogICAgIFN0cmluZyB0eXBlU3RyaW5nID0gaW50 bFN0cmluZ09wdGlvbihnbG9iYWxPYmplY3QsIG9wdGlvbnMsIHZtLnByb3BlcnR5TmFtZXMtPnR5 cGUsIHsgImNhcmRpbmFsIiwgIm9yZGluYWwiIH0sICJ0eXBlIG11c3QgYmUgXCJjYXJkaW5hbFwi IG9yIFwib3JkaW5hbFwiIiwgImNhcmRpbmFsIik7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgdm9pZCgpKTsKLSAgICBtX3R5cGUgPSB0eXBlU3RyaW5nID09ICJvcmRpbmFsIiA/IFVQ TFVSQUxfVFlQRV9PUkRJTkFMIDogVVBMVVJBTF9UWVBFX0NBUkRJTkFMOworICAgIG1fdHlwZSA9 IHR5cGVTdHJpbmcgPT0gIm9yZGluYWwiID8gVHlwZTo6T3JkaW5hbCA6IFR5cGU6OkNhcmRpbmFs OwogCiAgICAgdW5zaWduZWQgbWluaW11bUludGVnZXJEaWdpdHMgPSBpbnRsTnVtYmVyT3B0aW9u KGdsb2JhbE9iamVjdCwgb3B0aW9ucywgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgIm1pbmlt dW1JbnRlZ2VyRGlnaXRzIiksIDEsIDIxLCAxKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCB2b2lkKCkpOwpAQCAtMTcyLDcgKzE3Miw3IEBAIHZvaWQgSW50bFBsdXJhbFJ1bGVzOjpp bml0aWFsaXplUGx1cmFsUnVsZXMoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSlNWYWx1 CiAgICAgfQogCiAgICAgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwotICAgIG1fcGx1cmFsUnVsZXMg PSBzdGQ6OnVuaXF1ZV9wdHI8VVBsdXJhbFJ1bGVzLCBVUGx1cmFsUnVsZXNEZWxldGVyPih1cGxy dWxlc19vcGVuRm9yVHlwZShtX2xvY2FsZS51dGY4KCkuZGF0YSgpLCBtX3R5cGUsICZzdGF0dXMp KTsKKyAgICBtX3BsdXJhbFJ1bGVzID0gc3RkOjp1bmlxdWVfcHRyPFVQbHVyYWxSdWxlcywgVVBs dXJhbFJ1bGVzRGVsZXRlcj4odXBscnVsZXNfb3BlbkZvclR5cGUobV9sb2NhbGUudXRmOCgpLmRh dGEoKSwgbV90eXBlID09IFR5cGU6Ok9yZGluYWwgPyBVUExVUkFMX1RZUEVfT1JESU5BTCA6IFVQ TFVSQUxfVFlQRV9DQVJESU5BTCwgJnN0YXR1cykpOwogICAgIGlmIChVX0ZBSUxVUkUoc3RhdHVz KSkgewogICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiZmFpbGVk IHRvIGluaXRpYWxpemUgUGx1cmFsUnVsZXMiX3MpOwogICAgICAgICByZXR1cm47CkBAIC0xODks NyArMTg5LDcgQEAgSlNPYmplY3QqIEludGxQbHVyYWxSdWxlczo6cmVzb2x2ZWRPcHRpb25zKEpT R2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QpIGNvbnN0CiAKICAgICBKU09iamVjdCogb3B0aW9u cyA9IGNvbnN0cnVjdEVtcHR5T2JqZWN0KGdsb2JhbE9iamVjdCk7CiAgICAgb3B0aW9ucy0+cHV0 RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5sb2NhbGUsIGpzTm9udHJpdmlhbFN0cmluZyh2 bSwgbV9sb2NhbGUpKTsKLSAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFt ZXMtPnR5cGUsIGpzTm9udHJpdmlhbFN0cmluZyh2bSwgbV90eXBlID09IFVQTFVSQUxfVFlQRV9P UkRJTkFMID8gIm9yZGluYWwiX3MgOiAiY2FyZGluYWwiX3MpKTsKKyAgICBvcHRpb25zLT5wdXRE aXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPnR5cGUsIGpzTm9udHJpdmlhbFN0cmluZyh2bSwg bV90eXBlID09IFR5cGU6Ok9yZGluYWwgPyAib3JkaW5hbCJfcyA6ICJjYXJkaW5hbCJfcykpOwog ICAgIG9wdGlvbnMtPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgIm1p bmltdW1JbnRlZ2VyRGlnaXRzIiksIGpzTnVtYmVyKG1fbWluaW11bUludGVnZXJEaWdpdHMpKTsK ICAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJt aW5pbXVtRnJhY3Rpb25EaWdpdHMiKSwganNOdW1iZXIobV9taW5pbXVtRnJhY3Rpb25EaWdpdHMp KTsKICAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0s ICJtYXhpbXVtRnJhY3Rpb25EaWdpdHMiKSwganNOdW1iZXIobV9tYXhpbXVtRnJhY3Rpb25EaWdp dHMpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxQbHVy YWxSdWxlcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFBsdXJhbFJ1bGVz LmgKaW5kZXggZDM3MTI3MzZmYWZiMmEyMWEyYTY3Y2FiZTRmYTE4NWJkN2UwNWUxZC4uYjAxNWZl ODJhMGU2OTNhMGNiZDA4MmIyMjBmMjU1ZDgyYWU3NGI3MSAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFBsdXJhbFJ1bGVzLmgKKysrIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSW50bFBsdXJhbFJ1bGVzLmgKQEAgLTY0LDYgKzY0LDggQEAgcHJp dmF0ZToKIAogICAgIHN0YXRpYyBWZWN0b3I8U3RyaW5nPiBsb2NhbGVEYXRhKGNvbnN0IFN0cmlu ZyYsIHNpemVfdCk7CiAKKyAgICBlbnVtIGNsYXNzIFR5cGUgOiBib29sIHsgQ2FyZGluYWwsIE9y ZGluYWwgfTsKKwogICAgIHN0cnVjdCBVUGx1cmFsUnVsZXNEZWxldGVyIHsKICAgICAgICAgdm9p ZCBvcGVyYXRvcigpKFVQbHVyYWxSdWxlcyopIGNvbnN0OwogICAgIH07CkBAIC03NSwxMiArNzcs MTIgQEAgcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1ZV9wdHI8VU51bWJlckZvcm1hdCwgVU51bWJl ckZvcm1hdERlbGV0ZXI+IG1fbnVtYmVyRm9ybWF0OwogCiAgICAgU3RyaW5nIG1fbG9jYWxlOwot ICAgIFVQbHVyYWxUeXBlIG1fdHlwZSB7IFVQTFVSQUxfVFlQRV9DQVJESU5BTCB9OwogICAgIHVu c2lnbmVkIG1fbWluaW11bUludGVnZXJEaWdpdHMgeyAxIH07CiAgICAgdW5zaWduZWQgbV9taW5p bXVtRnJhY3Rpb25EaWdpdHMgeyAwIH07CiAgICAgdW5zaWduZWQgbV9tYXhpbXVtRnJhY3Rpb25E aWdpdHMgeyAzIH07CiAgICAgT3B0aW9uYWw8dW5zaWduZWQ+IG1fbWluaW11bVNpZ25pZmljYW50 RGlnaXRzOwogICAgIE9wdGlvbmFsPHVuc2lnbmVkPiBtX21heGltdW1TaWduaWZpY2FudERpZ2l0 czsKKyAgICBUeXBlIG1fdHlwZSB7IFR5cGU6OkNhcmRpbmFsIH07CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBKU0MKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxS ZWxhdGl2ZVRpbWVGb3JtYXQuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50 bFJlbGF0aXZlVGltZUZvcm1hdC5jcHAKaW5kZXggMzA5MzgwOWJkN2ViMDVkNzkxNDY4ZDU5NjQ2 MzA2NGUyMWVjMTk4OC4uOTFiMWJmYTE0MjU4OTFmN2MzYzg1NDRhMmI3NDk4MDMwZjdjNDZlNyAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFJlbGF0aXZlVGlt ZUZvcm1hdC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bFJlbGF0 aXZlVGltZUZvcm1hdC5jcHAKQEAgLTEzNSwxNCArMTM1LDE4IEBAIHZvaWQgSW50bFJlbGF0aXZl VGltZUZvcm1hdDo6aW5pdGlhbGl6ZVJlbGF0aXZlVGltZUZvcm1hdChKU0dsb2JhbE9iamVjdCog Z2xvYmFsCiAKICAgICBTdHJpbmcgc3R5bGUgPSBpbnRsU3RyaW5nT3B0aW9uKGdsb2JhbE9iamVj dCwgb3B0aW9ucywgdm0ucHJvcGVydHlOYW1lcy0+c3R5bGUsIHsgImxvbmciLCAic2hvcnQiLCAi bmFycm93IiB9LCAic3R5bGUgbXVzdCBiZSBlaXRoZXIgXCJsb25nXCIsIFwic2hvcnRcIiwgb3Ig XCJuYXJyb3dcIiIsICJsb25nIik7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9p ZCgpKTsKLSAgICBpZiAoc3R5bGUgPT0gImxvbmciKQotICAgICAgICBtX3N0eWxlID0gVURBVF9T VFlMRV9MT05HOwotICAgIGVsc2UgaWYgKHN0eWxlID09ICJzaG9ydCIpCi0gICAgICAgIG1fc3R5 bGUgPSBVREFUX1NUWUxFX1NIT1JUOwotICAgIGVsc2UgaWYgKHN0eWxlID09ICJuYXJyb3ciKQot ICAgICAgICBtX3N0eWxlID0gVURBVF9TVFlMRV9OQVJST1c7Ci0gICAgZWxzZQotICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICBVRGF0ZVJlbGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXJT dHlsZSBpY3VTdHlsZTsKKyAgICBpZiAoc3R5bGUgPT0gImxvbmciKSB7CisgICAgICAgIGljdVN0 eWxlID0gVURBVF9TVFlMRV9MT05HOworICAgICAgICBtX3N0eWxlID0gU3R5bGU6Okxvbmc7Cisg ICAgfSBlbHNlIGlmIChzdHlsZSA9PSAic2hvcnQiKSB7CisgICAgICAgIGljdVN0eWxlID0gVURB VF9TVFlMRV9TSE9SVDsKKyAgICAgICAgbV9zdHlsZSA9IFN0eWxlOjpTaG9ydDsKKyAgICB9IGVs c2UgeworICAgICAgICBBU1NFUlQoc3R5bGUgPT0gIm5hcnJvdyIpOworICAgICAgICBpY3VTdHls ZSA9IFVEQVRfU1RZTEVfTkFSUk9XOworICAgICAgICBtX3N0eWxlID0gU3R5bGU6Ok5hcnJvdzsK KyAgICB9CiAKICAgICBTdHJpbmcgbnVtZXJpYyA9IGludGxTdHJpbmdPcHRpb24oZ2xvYmFsT2Jq ZWN0LCBvcHRpb25zLCB2bS5wcm9wZXJ0eU5hbWVzLT5udW1lcmljLCB7ICJhbHdheXMiLCAiYXV0 byIgfSwgIm51bWVyaWMgbXVzdCBiZSBlaXRoZXIgXCJhbHdheXNcIiBvciBcImF1dG9cIiIsICJh bHdheXMiKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwpAQCAtMTU1 LDMyICsxNTksMjcgQEAgdm9pZCBJbnRsUmVsYXRpdmVUaW1lRm9ybWF0Ojppbml0aWFsaXplUmVs YXRpdmVUaW1lRm9ybWF0KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWwKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIG1fcmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciA9IHN0ZDo6dW5pcXVlX3B0 cjxVUmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciwgVVJlbGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXJE ZWxldGVyPih1cmVsZGF0ZWZtdF9vcGVuKGRhdGFMb2NhbGVXaXRoRXh0ZW5zaW9ucy5kYXRhKCks IG51bGxwdHIsIG1fc3R5bGUsIFVESVNQQ1RYX0NBUElUQUxJWkFUSU9OX0ZPUl9TVEFOREFMT05F LCAmc3RhdHVzKSk7CisgICAgbV9yZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyID0gc3RkOjp1bmlx dWVfcHRyPFVSZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyLCBVUmVsYXRpdmVEYXRlVGltZUZvcm1h dHRlckRlbGV0ZXI+KHVyZWxkYXRlZm10X29wZW4oZGF0YUxvY2FsZVdpdGhFeHRlbnNpb25zLmRh dGEoKSwgbnVsbHB0ciwgaWN1U3R5bGUsIFVESVNQQ1RYX0NBUElUQUxJWkFUSU9OX0ZPUl9TVEFO REFMT05FLCAmc3RhdHVzKSk7CiAgICAgaWYgKFVOTElLRUxZKFVfRkFJTFVSRShzdGF0dXMpKSkg ewogICAgICAgICB0aHJvd1R5cGVFcnJvcihnbG9iYWxPYmplY3QsIHNjb3BlLCAiZmFpbGVkIHRv IGluaXRpYWxpemUgUmVsYXRpdmVUaW1lRm9ybWF0Il9zKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIH0KIAotc3RhdGljIEFTQ0lJTGl0ZXJhbCBzdHlsZVN0cmluZyhVRGF0ZVJlbGF0aXZlRGF0 ZVRpbWVGb3JtYXR0ZXJTdHlsZSBzdHlsZSkKK0FTQ0lJTGl0ZXJhbCBJbnRsUmVsYXRpdmVUaW1l Rm9ybWF0OjpzdHlsZVN0cmluZyhTdHlsZSBzdHlsZSkKIHsKICAgICBzd2l0Y2ggKHN0eWxlKSB7 Ci0gICAgY2FzZSBVREFUX1NUWUxFX0xPTkc6CisgICAgY2FzZSBTdHlsZTo6TG9uZzoKICAgICAg ICAgcmV0dXJuICJsb25nIl9zOwotICAgIGNhc2UgVURBVF9TVFlMRV9TSE9SVDoKKyAgICBjYXNl IFN0eWxlOjpTaG9ydDoKICAgICAgICAgcmV0dXJuICJzaG9ydCJfczsKLSAgICBjYXNlIFVEQVRf U1RZTEVfTkFSUk9XOgorICAgIGNhc2UgU3R5bGU6Ok5hcnJvdzoKICAgICAgICAgcmV0dXJuICJu YXJyb3ciX3M7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBB U0NJSUxpdGVyYWw6Om51bGwoKTsKIH0KIAotc3RhdGljIEFTQ0lJTGl0ZXJhbCBudW1lcmljU3Ry aW5nKGJvb2wgbnVtZXJpYykKLXsKLSAgICByZXR1cm4gbnVtZXJpYyA/ICJhbHdheXMiX3MgOiAi YXV0byJfczsKLX0KLQogLy8gaHR0cHM6Ly90YzM5LmVzL2VjbWE0MDIvI3NlYy1pbnRsLnJlbGF0 aXZldGltZWZvcm1hdC5wcm90b3R5cGUucmVzb2x2ZWRvcHRpb25zCiBKU09iamVjdCogSW50bFJl bGF0aXZlVGltZUZvcm1hdDo6cmVzb2x2ZWRPcHRpb25zKEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxP YmplY3QpIGNvbnN0CiB7CkBAIC0xODgsNyArMTg3LDcgQEAgSlNPYmplY3QqIEludGxSZWxhdGl2 ZVRpbWVGb3JtYXQ6OnJlc29sdmVkT3B0aW9ucyhKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0 KQogICAgIEpTT2JqZWN0KiBvcHRpb25zID0gY29uc3RydWN0RW1wdHlPYmplY3QoZ2xvYmFsT2Jq ZWN0KTsKICAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIHZtLnByb3BlcnR5TmFtZXMtPmxvY2Fs ZSwganNOb250cml2aWFsU3RyaW5nKHZtLCBtX2xvY2FsZSkpOwogICAgIG9wdGlvbnMtPnB1dERp cmVjdCh2bSwgdm0ucHJvcGVydHlOYW1lcy0+c3R5bGUsIGpzTm9udHJpdmlhbFN0cmluZyh2bSwg c3R5bGVTdHJpbmcobV9zdHlsZSkpKTsKLSAgICBvcHRpb25zLT5wdXREaXJlY3Qodm0sIHZtLnBy b3BlcnR5TmFtZXMtPm51bWVyaWMsIGpzTm9udHJpdmlhbFN0cmluZyh2bSwgbnVtZXJpY1N0cmlu ZyhtX251bWVyaWMpKSk7CisgICAgb3B0aW9ucy0+cHV0RGlyZWN0KHZtLCB2bS5wcm9wZXJ0eU5h bWVzLT5udW1lcmljLCBqc05vbnRyaXZpYWxTdHJpbmcodm0sIG1fbnVtZXJpYyA/ICJhbHdheXMi X3MgOiAiYXV0byJfcykpOwogICAgIG9wdGlvbnMtPnB1dERpcmVjdCh2bSwgdm0ucHJvcGVydHlO YW1lcy0+bnVtYmVyaW5nU3lzdGVtLCBqc05vbnRyaXZpYWxTdHJpbmcodm0sIG1fbnVtYmVyaW5n U3lzdGVtKSk7CiAgICAgcmV0dXJuIG9wdGlvbnM7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0LmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9JbnRsUmVsYXRpdmVUaW1lRm9ybWF0LmgKaW5kZXggMDg0N2I1 ZTgzM2MyZWIwN2VmMDQzYTQ4YzRhMTRhNjI5YmNhYTg2OC4uODViODFmYTgzOGQzNWVmMzNlZTlj MGFlNmE1MDI3MGQxNmY4NTVkYSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvSW50bFJlbGF0aXZlVGltZUZvcm1hdC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0ludGxSZWxhdGl2ZVRpbWVGb3JtYXQuaApAQCAtNjYsNiArNjYsOCBAQCBwcml2 YXRlOgogCiAgICAgU3RyaW5nIGZvcm1hdEludGVybmFsKEpTR2xvYmFsT2JqZWN0KiwgZG91Ymxl LCBTdHJpbmdWaWV3IHVuaXQpIGNvbnN0OwogCisgICAgZW51bSBjbGFzcyBTdHlsZSA6IHVpbnQ4 X3QgeyBMb25nLCBTaG9ydCwgTmFycm93IH07CisKICAgICBzdHJ1Y3QgVVJlbGF0aXZlRGF0ZVRp bWVGb3JtYXR0ZXJEZWxldGVyIHsKICAgICAgICAgdm9pZCBvcGVyYXRvcigpKFVSZWxhdGl2ZURh dGVUaW1lRm9ybWF0dGVyKikgY29uc3Q7CiAgICAgfTsKQEAgLTczLDEyICs3NSwxNCBAQCBwcml2 YXRlOgogICAgICAgICB2b2lkIG9wZXJhdG9yKCkoVU51bWJlckZvcm1hdCopIGNvbnN0OwogICAg IH07CiAKKyAgICBzdGF0aWMgQVNDSUlMaXRlcmFsIHN0eWxlU3RyaW5nKFN0eWxlKTsKKwogICAg IHN0ZDo6dW5pcXVlX3B0cjxVUmVsYXRpdmVEYXRlVGltZUZvcm1hdHRlciwgVVJlbGF0aXZlRGF0 ZVRpbWVGb3JtYXR0ZXJEZWxldGVyPiBtX3JlbGF0aXZlRGF0ZVRpbWVGb3JtYXR0ZXI7CiAgICAg c3RkOjp1bmlxdWVfcHRyPFVOdW1iZXJGb3JtYXQsIFVOdW1iZXJGb3JtYXREZWxldGVyPiBtX251 bWJlckZvcm1hdDsKIAogICAgIFN0cmluZyBtX2xvY2FsZTsKICAgICBTdHJpbmcgbV9udW1iZXJp bmdTeXN0ZW07Ci0gICAgVURhdGVSZWxhdGl2ZURhdGVUaW1lRm9ybWF0dGVyU3R5bGUgbV9zdHls ZSB7IFVEQVRfU1RZTEVfTE9ORyB9OworICAgIFN0eWxlIG1fc3R5bGUgeyBTdHlsZTo6TG9uZyB9 OwogICAgIGJvb2wgbV9udW1lcmljIHsgdHJ1ZSB9OwogfTsKIAo=