247470 2022-11-03 18:07:01 -0700 Replace makeprop.pl with a more structured parser/code generator 2022-11-07 10:38:19 -0800 1 1 1 Unclassified WebKit CSS WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam simon.fraser webkit-bug-importer oldest_to_newest 1910246 0 sam 2022-11-03 18:07:01 -0700 Replace makeprop.pl with a more structured parser/code generator 1910247 1 webkit-bug-importer 2022-11-03 18:07:29 -0700 <rdar://problem/101940205> 1910263 2 sam 2022-11-03 19:11:48 -0700 Pull request: https://github.com/WebKit/WebKit/pull/6120 1910657 3 463440 sam 2022-11-06 13:06:01 -0800 Created attachment 463440 Final Diff 1910658 4 463441 sam 2022-11-06 13:08:56 -0800 Created attachment 463441 Final Diff 1910818 5 ews-feeder 2022-11-07 10:22:36 -0800 Committed 256414@main (9047d68a603f): <https://commits.webkit.org/256414@main> Reviewed commits have been landed. Closing PR #6120 and removing active labels. 1910823 6 simon.fraser 2022-11-07 10:38:19 -0800 Nice! 463440 2022-11-06 13:06:01 -0800 2022-11-06 13:09:06 -0800 Final Diff final-diff.diff text/plain 8187 sam ZGlmZiAtdSBleGlzdGluZy9DU1NQcm9wZXJ0eU5hbWVzLmdwZXJmIG5ld3N0dWZmL0NTU1Byb3Bl cnR5TmFtZXMuZ3BlcmYKLS0tIGV4aXN0aW5nL0NTU1Byb3BlcnR5TmFtZXMuZ3BlcmYJMjAyMi0x MS0wNiAxMDoyOTowNQorKysgbmV3c3R1ZmYvQ1NTUHJvcGVydHlOYW1lcy5ncGVyZgkyMDIyLTEx LTA2IDExOjM3OjE4CkBAIC0xLDExICsxLDEwIEBACiAlewotLy8gVGhpcyBmaWxlIGlzIGF1dG9t YXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBtYWtlcHJv cC5wbCBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LgorLy8gVGhpcyBmaWxlIGlzIGF1dG9tYXRpY2Fs bHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBwcm9jZXNzLWNzcy1w cm9wZXJ0aWVzIHNjcmlwdC4gRG8gbm90IGVkaXQgaXQuCiAKICNpbmNsdWRlICJjb25maWcuaCIK ICNpbmNsdWRlICJDU1NQcm9wZXJ0eU5hbWVzLmgiCiAKICNpbmNsdWRlICJDU1NQcm9wZXJ0eS5o IgotI2luY2x1ZGUgIkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlNldHRp bmdzLmgiCiAjaW5jbHVkZSA8d3RmL0FTQ0lJQ1R5cGUuaD4KICNpbmNsdWRlIDx3dGYvSGFzaGVy Lmg+CkBAIC0zMDE3LDE0ICszMDE2LDE0IEBACiAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQ cm9wZXJ0eUNvbnRhaW5JbnRyaW5zaWNCbG9ja1NpemU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUlE OjpDU1NQcm9wZXJ0eUNvbnRhaW5JbnRyaW5zaWNJbmxpbmVTaXplOgogICAgICAgICBzd2l0Y2gg KGlkMikgewotICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5Q29udGFpbklu dHJpbnNpY1dpZHRoOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5Q29u dGFpbkludHJpbnNpY0hlaWdodDoKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9w ZXJ0eUNvbnRhaW5JbnRyaW5zaWNXaWR0aDoKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0gICAg Y2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eUNvbnRhaW5JbnRyaW5zaWNXaWR0aDoKICAg ICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5Q29udGFpbkludHJpbnNpY0hlaWdodDoK KyAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5Q29udGFpbkludHJpbnNpY1dpZHRo OgogICAgICAgICBzd2l0Y2ggKGlkMikgewogICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNT U1Byb3BlcnR5Q29udGFpbkludHJpbnNpY0Jsb2NrU2l6ZToKICAgICAgICAgY2FzZSBDU1NQcm9w ZXJ0eUlEOjpDU1NQcm9wZXJ0eUNvbnRhaW5JbnRyaW5zaWNJbmxpbmVTaXplOgpAQCAtMzA4Nywx NCArMzA4NiwxNCBAQAogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNYXhCbG9j a1NpemU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1heElubGluZVNpemU6 CiAgICAgICAgIHN3aXRjaCAoaWQyKSB7Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NT UHJvcGVydHlNYXhXaWR0aDoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0 eU1heEhlaWdodDoKKyAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1heFdp ZHRoOgogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KLSAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNT U1Byb3BlcnR5TWF4V2lkdGg6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1h eEhlaWdodDoKKyAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5TWF4V2lkdGg6CiAg ICAgICAgIHN3aXRjaCAoaWQyKSB7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJv cGVydHlNYXhCbG9ja1NpemU6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVy dHlNYXhJbmxpbmVTaXplOgpAQCAtMzEwNSwxNCArMzEwNCwxNCBAQAogICAgIGNhc2UgQ1NTUHJv cGVydHlJRDo6Q1NTUHJvcGVydHlNaW5CbG9ja1NpemU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUlE OjpDU1NQcm9wZXJ0eU1pbklubGluZVNpemU6CiAgICAgICAgIHN3aXRjaCAoaWQyKSB7Ci0gICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNaW5XaWR0aDoKICAgICAgICAgY2Fz ZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1pbkhlaWdodDoKKyAgICAgICAgY2FzZSBDU1NQ cm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1pbldpZHRoOgogICAgICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0K LSAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5TWluV2lkdGg6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1pbkhlaWdodDoKKyAgICBjYXNlIENTU1Byb3BlcnR5 SUQ6OkNTU1Byb3BlcnR5TWluV2lkdGg6CiAgICAgICAgIHN3aXRjaCAoaWQyKSB7CiAgICAgICAg IGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNaW5CbG9ja1NpemU6CiAgICAgICAgIGNh c2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNaW5JbmxpbmVTaXplOgpAQCAtMzIxOSwxNCAr MzIxOCwxNCBAQAogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlCbG9ja1NpemU6 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eUlubGluZVNpemU6CiAgICAgICAg IHN3aXRjaCAoaWQyKSB7Ci0gICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlX aWR0aDoKICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eUhlaWdodDoKKyAg ICAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eVdpZHRoOgogICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIH0KLSAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5V2lkdGg6CiAg ICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eUhlaWdodDoKKyAgICBjYXNlIENTU1By b3BlcnR5SUQ6OkNTU1Byb3BlcnR5V2lkdGg6CiAgICAgICAgIHN3aXRjaCAoaWQyKSB7CiAgICAg ICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlCbG9ja1NpemU6CiAgICAgICAgIGNh c2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlJbmxpbmVTaXplOgpAQCAtMzY3Miw4ICszNjcx LDcgQEAKIAogYm9vbCBvcGVyYXRvcj09KGNvbnN0IENTU1Byb3BlcnR5U2V0dGluZ3MmIGEsIGNv bnN0IENTU1Byb3BlcnR5U2V0dGluZ3MmIGIpCiB7Ci0gICAgcmV0dXJuIHRydWUKLSAgICAgICAg JiYgYS5DU1NPTVZpZXdTbW9vdGhTY3JvbGxpbmdFbmFibGVkID09IGIuQ1NTT01WaWV3U21vb3Ro U2Nyb2xsaW5nRW5hYmxlZAorICAgIHJldHVybiBhLkNTU09NVmlld1Ntb290aFNjcm9sbGluZ0Vu YWJsZWQgPT0gYi5DU1NPTVZpZXdTbW9vdGhTY3JvbGxpbmdFbmFibGVkCiAgICAgICAgICYmIGEu YWNjZW50Q29sb3JFbmFibGVkID09IGIuYWNjZW50Q29sb3JFbmFibGVkCiAgICAgICAgICYmIGEu YXNwZWN0UmF0aW9FbmFibGVkID09IGIuYXNwZWN0UmF0aW9FbmFibGVkCiAgICAgICAgICYmIGEu Y29sb3JGaWx0ZXJFbmFibGVkID09IGIuY29sb3JGaWx0ZXJFbmFibGVkCkBAIC0zNjkwLDE0ICsz Njg4LDEyIEBACiAgICAgICAgICYmIGEuY3NzVGV4dEp1c3RpZnlFbmFibGVkID09IGIuY3NzVGV4 dEp1c3RpZnlFbmFibGVkCiAgICAgICAgICYmIGEub3ZlcnNjcm9sbEJlaGF2aW9yRW5hYmxlZCA9 PSBiLm92ZXJzY3JvbGxCZWhhdmlvckVuYWJsZWQKICAgICAgICAgJiYgYS50ZXh0QXV0b3Npemlu Z0VuYWJsZWQgPT0gYi50ZXh0QXV0b3NpemluZ0VuYWJsZWQKLSAgICAgICAgJiYgYS53ZWJBbmlt YXRpb25zQ29tcG9zaXRlT3BlcmF0aW9uc0VuYWJsZWQgPT0gYi53ZWJBbmltYXRpb25zQ29tcG9z aXRlT3BlcmF0aW9uc0VuYWJsZWQKLSAgICA7CisgICAgICAgICYmIGEud2ViQW5pbWF0aW9uc0Nv bXBvc2l0ZU9wZXJhdGlvbnNFbmFibGVkID09IGIud2ViQW5pbWF0aW9uc0NvbXBvc2l0ZU9wZXJh dGlvbnNFbmFibGVkOwogfQogCiB2b2lkIGFkZChIYXNoZXImIGhhc2hlciwgY29uc3QgQ1NTUHJv cGVydHlTZXR0aW5ncyYgc2V0dGluZ3MpCiB7Ci0gICAgdW5zaWduZWQgYml0cyA9IDAKLSAgICAg ICAgfCBzZXR0aW5ncy5DU1NPTVZpZXdTbW9vdGhTY3JvbGxpbmdFbmFibGVkIDw8IDAKKyAgICB1 bnNpZ25lZCBiaXRzID0gc2V0dGluZ3MuQ1NTT01WaWV3U21vb3RoU2Nyb2xsaW5nRW5hYmxlZCA8 PCAwCiAgICAgICAgIHwgc2V0dGluZ3MuYWNjZW50Q29sb3JFbmFibGVkIDw8IDEKICAgICAgICAg fCBzZXR0aW5ncy5hc3BlY3RSYXRpb0VuYWJsZWQgPDwgMgogICAgICAgICB8IHNldHRpbmdzLmNv bG9yRmlsdGVyRW5hYmxlZCA8PCAzCkBAIC0zNzE0LDggKzM3MTAsNyBAQAogICAgICAgICB8IHNl dHRpbmdzLmNzc1RleHRKdXN0aWZ5RW5hYmxlZCA8PCAxNAogICAgICAgICB8IHNldHRpbmdzLm92 ZXJzY3JvbGxCZWhhdmlvckVuYWJsZWQgPDwgMTUKICAgICAgICAgfCBzZXR0aW5ncy50ZXh0QXV0 b3NpemluZ0VuYWJsZWQgPDwgMTYKLSAgICAgICAgfCBzZXR0aW5ncy53ZWJBbmltYXRpb25zQ29t cG9zaXRlT3BlcmF0aW9uc0VuYWJsZWQgPDwgMTcKLSAgICA7CisgICAgICAgIHwgc2V0dGluZ3Mu d2ViQW5pbWF0aW9uc0NvbXBvc2l0ZU9wZXJhdGlvbnNFbmFibGVkIDw8IDE3OwogICAgIGFkZCho YXNoZXIsIGJpdHMpOwogfQogCmRpZmYgLXUgZXhpc3RpbmcvQ1NTUHJvcGVydHlOYW1lcy5oIG5l d3N0dWZmL0NTU1Byb3BlcnR5TmFtZXMuaAotLS0gZXhpc3RpbmcvQ1NTUHJvcGVydHlOYW1lcy5o CTIwMjItMTEtMDYgMTA6Mjk6MDUKKysrIG5ld3N0dWZmL0NTU1Byb3BlcnR5TmFtZXMuaAkyMDIy LTExLTA2IDExOjM3OjE4CkBAIC0xLDQgKzEsNCBAQAotLy8gVGhpcyBmaWxlIGlzIGF1dG9tYXRp Y2FsbHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBtYWtlcHJvcC5w bCBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LgorLy8gVGhpcyBmaWxlIGlzIGF1dG9tYXRpY2FsbHkg Z2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBwcm9jZXNzLWNzcy1wcm9w ZXJ0aWVzIHNjcmlwdC4gRG8gbm90IGVkaXQgaXQuCiAKICNwcmFnbWEgb25jZQogCmRpZmYgLXUg ZXhpc3RpbmcvQ1NTU3R5bGVEZWNsYXJhdGlvbitQcm9wZXJ0eU5hbWVzLmlkbCBuZXdzdHVmZi9D U1NTdHlsZURlY2xhcmF0aW9uK1Byb3BlcnR5TmFtZXMuaWRsCi0tLSBleGlzdGluZy9DU1NTdHls ZURlY2xhcmF0aW9uK1Byb3BlcnR5TmFtZXMuaWRsCTIwMjItMTEtMDYgMTA6Mjk6MDUKKysrIG5l d3N0dWZmL0NTU1N0eWxlRGVjbGFyYXRpb24rUHJvcGVydHlOYW1lcy5pZGwJMjAyMi0xMS0wNiAx MTozNzoxOApAQCAtMSw0ICsxLDQgQEAKLS8vIFRoaXMgZmlsZSBpcyBhdXRvbWF0aWNhbGx5IGdl bmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUgbWFrZXByb3AucGwgc2NyaXB0 LiBEbyBub3QgZWRpdCBpdC4KKy8vIFRoaXMgZmlsZSBpcyBhdXRvbWF0aWNhbGx5IGdlbmVyYXRl ZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUgcHJvY2Vzcy1jc3MtcHJvcGVydGllcyBz Y3JpcHQuIERvIG5vdCBlZGl0IGl0LgogCiB0eXBlZGVmIFVTVlN0cmluZyBDU1NPTVN0cmluZzsK IApAQCAtMTQwOSw0ICsxNDA5LDMgQEAKICAgICBbQ0VSZWFjdGlvbnMsIERlbGVnYXRlVG9TaGFy ZWRTeW50aGV0aWNBdHRyaWJ1dGU9cHJvcGVydHlWYWx1ZUZvckVwdWJDYXNlZElETEF0dHJpYnV0 ZSwgQ2FsbFdpdGg9UHJvcGVydHlOYW1lXSBhdHRyaWJ1dGUgW0xlZ2FjeU51bGxUb0VtcHR5U3Ry aW5nXSBDU1NPTVN0cmluZyBlcHViV29yZEJyZWFrOwogICAgIFtDRVJlYWN0aW9ucywgRGVsZWdh dGVUb1NoYXJlZFN5bnRoZXRpY0F0dHJpYnV0ZT1wcm9wZXJ0eVZhbHVlRm9yRXB1YkNhc2VkSURM QXR0cmlidXRlLCBDYWxsV2l0aD1Qcm9wZXJ0eU5hbWVdIGF0dHJpYnV0ZSBbTGVnYWN5TnVsbFRv RW1wdHlTdHJpbmddIENTU09NU3RyaW5nIGVwdWJXcml0aW5nTW9kZTsKIH07Ci0KZGlmZiAtdSBl eGlzdGluZy9TdHlsZUJ1aWxkZXJHZW5lcmF0ZWQuY3BwIG5ld3N0dWZmL1N0eWxlQnVpbGRlckdl bmVyYXRlZC5jcHAKLS0tIGV4aXN0aW5nL1N0eWxlQnVpbGRlckdlbmVyYXRlZC5jcHAJMjAyMi0x MS0wNiAxMDoyOTowNQorKysgbmV3c3R1ZmYvU3R5bGVCdWlsZGVyR2VuZXJhdGVkLmNwcAkyMDIy LTExLTA2IDExOjM3OjE4CkBAIC0xLDQgKzEsNCBAQAotLy8gVGhpcyBmaWxlIGlzIGF1dG9tYXRp Y2FsbHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBtYWtlcHJvcC5w bCBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LgorLy8gVGhpcyBmaWxlIGlzIGF1dG9tYXRpY2FsbHkg Z2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBwcm9jZXNzLWNzcy1wcm9w ZXJ0aWVzIHNjcmlwdC4gRG8gbm90IGVkaXQgaXQuCiAKICNpbmNsdWRlICJjb25maWcuaCIKICNp bmNsdWRlICJTdHlsZUJ1aWxkZXJHZW5lcmF0ZWQuaCIKQEAgLTg3MTgsNyArODcxOCw3IEBACiAg ICAgICAgIEFTU0VSVChpc1Nob3J0aGFuZENTU1Byb3BlcnR5KGlkKSk7CiAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICBicmVhazsKLSAgICB9OworICAgIH0KIH0KIAogfSAv LyBuYW1lc3BhY2UgU3R5bGUKZGlmZiAtdSBleGlzdGluZy9TdHlsZVByb3BlcnR5U2hvcnRoYW5k RnVuY3Rpb25zLmNwcCBuZXdzdHVmZi9TdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmNw cAotLS0gZXhpc3RpbmcvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5jcHAJMjAyMi0x MS0wNiAxMDoyOTowNQorKysgbmV3c3R1ZmYvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9u cy5jcHAJMjAyMi0xMS0wNiAxMTozNzoxOApAQCAtMSw0ICsxLDQgQEAKLS8vIFRoaXMgZmlsZSBp cyBhdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUg bWFrZXByb3AucGwgc2NyaXB0LiBEbyBub3QgZWRpdCBpdC4KKy8vIFRoaXMgZmlsZSBpcyBhdXRv bWF0aWNhbGx5IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUgcHJvY2Vz cy1jc3MtcHJvcGVydGllcyBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LiIKIAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIlN0eWxlUHJvcGVydHlTaG9ydGhhbmRGdW5jdGlvbnMuaCIKQEAg LTE1MDgsNiArMTUwOCw3IEBACiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogfQorCiBTdHls ZVByb3BlcnR5U2hvcnRoYW5kVmVjdG9yIG1hdGNoaW5nU2hvcnRoYW5kc0ZvckxvbmdoYW5kKENT U1Byb3BlcnR5SUQgaWQpCiB7CiAgICAgc3dpdGNoIChpZCkgewpAQCAtMjAyNCw0ICsyMDI1LDUg QEAKICAgICAgICAgcmV0dXJuIHsgfTsKICAgICB9CiB9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKZGlmZiAtdSBleGlzdGluZy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmggbmV3 c3R1ZmYvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5oCi0tLSBleGlzdGluZy9TdHls ZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmgJMjAyMi0xMS0wNiAxMDoyOTowNQorKysgbmV3 c3R1ZmYvU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1bmN0aW9ucy5oCTIwMjItMTEtMDYgMTE6Mzc6 MTgKQEAgLTEsNCArMSw0IEBACi0vLyBUaGlzIGZpbGUgaXMgYXV0b21hdGljYWxseSBnZW5lcmF0 ZWQgZnJvbSBDU1NQcm9wZXJ0aWVzLmpzb24gYnkgdGhlIG1ha2Vwcm9wLnBsIHNjcmlwdC4gRG8g bm90IGVkaXQgaXQuCisvLyBUaGlzIGZpbGUgaXMgYXV0b21hdGljYWxseSBnZW5lcmF0ZWQgZnJv bSBDU1NQcm9wZXJ0aWVzLmpzb24gYnkgdGhlIHByb2Nlc3MtY3NzLXByb3BlcnRpZXMgc2NyaXB0 LiBEbyBub3QgZWRpdCBpdC4KIAogI3ByYWdtYSBvbmNlCiAK 463441 2022-11-06 13:08:56 -0800 2022-11-06 13:08:56 -0800 Final Diff final-diff.diff text/plain 8201 sam ZGlmZiAtdSBleGlzdGluZy9DU1NQcm9wZXJ0eU5hbWVzLmdwZXJmIG5ld3N0dWZmL0NTU1Byb3Bl cnR5TmFtZXMuZ3BlcmYKLS0tIGV4aXN0aW5nL0NTU1Byb3BlcnR5TmFtZXMuZ3BlcmYJMjAyMi0x MS0wNiAxMjoxODoyMQorKysgbmV3c3R1ZmYvQ1NTUHJvcGVydHlOYW1lcy5ncGVyZgkyMDIyLTEx LTA2IDEyOjQ3OjMyCkBAIC0xLDUgKzEsNSBAQAogJXsKLS8vIFRoaXMgZmlsZSBpcyBhdXRvbWF0 aWNhbGx5IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUgbWFrZXByb3Au cGwgc2NyaXB0LiBEbyBub3QgZWRpdCBpdC4KKy8vIFRoaXMgZmlsZSBpcyBhdXRvbWF0aWNhbGx5 IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUgcHJvY2Vzcy1jc3MtcHJv cGVydGllcyBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LgogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiQ1NTUHJvcGVydHlOYW1lcy5oIgpAQCAtMzAxNiwxNCArMzAxNiwxNCBAQAogICAg IGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlDb250YWluSW50cmluc2ljQmxvY2tTaXpl OgogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlDb250YWluSW50cmluc2ljSW5s aW5lU2l6ZToKICAgICAgICAgc3dpdGNoIChpZDIpIHsKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0 eUlEOjpDU1NQcm9wZXJ0eUNvbnRhaW5JbnRyaW5zaWNXaWR0aDoKICAgICAgICAgY2FzZSBDU1NQ cm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eUNvbnRhaW5JbnRyaW5zaWNIZWlnaHQ6CisgICAgICAgIGNh c2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlDb250YWluSW50cmluc2ljV2lkdGg6CiAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgfQotICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlD b250YWluSW50cmluc2ljV2lkdGg6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0 eUNvbnRhaW5JbnRyaW5zaWNIZWlnaHQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9w ZXJ0eUNvbnRhaW5JbnRyaW5zaWNXaWR0aDoKICAgICAgICAgc3dpdGNoIChpZDIpIHsKICAgICAg ICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eUNvbnRhaW5JbnRyaW5zaWNCbG9ja1Np emU6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlDb250YWluSW50cmlu c2ljSW5saW5lU2l6ZToKQEAgLTMwODYsMTQgKzMwODYsMTQgQEAKICAgICBjYXNlIENTU1Byb3Bl cnR5SUQ6OkNTU1Byb3BlcnR5TWF4QmxvY2tTaXplOgogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6 Q1NTUHJvcGVydHlNYXhJbmxpbmVTaXplOgogICAgICAgICBzd2l0Y2ggKGlkMikgewotICAgICAg ICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5TWF4V2lkdGg6CiAgICAgICAgIGNhc2Ug Q1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNYXhIZWlnaHQ6CisgICAgICAgIGNhc2UgQ1NTUHJv cGVydHlJRDo6Q1NTUHJvcGVydHlNYXhXaWR0aDoKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0g ICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1heFdpZHRoOgogICAgIGNhc2UgQ1NT UHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNYXhIZWlnaHQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUlE OjpDU1NQcm9wZXJ0eU1heFdpZHRoOgogICAgICAgICBzd2l0Y2ggKGlkMikgewogICAgICAgICBj YXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5TWF4QmxvY2tTaXplOgogICAgICAgICBjYXNl IENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5TWF4SW5saW5lU2l6ZToKQEAgLTMxMDQsMTQgKzMx MDQsMTQgQEAKICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5TWluQmxvY2tTaXpl OgogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNaW5JbmxpbmVTaXplOgogICAg ICAgICBzd2l0Y2ggKGlkMikgewotICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3Bl cnR5TWluV2lkdGg6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNaW5I ZWlnaHQ6CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNaW5XaWR0aDoK ICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9w ZXJ0eU1pbldpZHRoOgogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVydHlNaW5IZWln aHQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eU1pbldpZHRoOgogICAgICAg ICBzd2l0Y2ggKGlkMikgewogICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5 TWluQmxvY2tTaXplOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5TWlu SW5saW5lU2l6ZToKQEAgLTMyMTgsMTQgKzMyMTgsMTQgQEAKICAgICBjYXNlIENTU1Byb3BlcnR5 SUQ6OkNTU1Byb3BlcnR5QmxvY2tTaXplOgogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJv cGVydHlJbmxpbmVTaXplOgogICAgICAgICBzd2l0Y2ggKGlkMikgewotICAgICAgICBjYXNlIENT U1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5V2lkdGg6CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJ RDo6Q1NTUHJvcGVydHlIZWlnaHQ6CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJv cGVydHlXaWR0aDoKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBkZWZhdWx0Ogog ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0gICAgY2FzZSBDU1NQcm9wZXJ0 eUlEOjpDU1NQcm9wZXJ0eVdpZHRoOgogICAgIGNhc2UgQ1NTUHJvcGVydHlJRDo6Q1NTUHJvcGVy dHlIZWlnaHQ6CisgICAgY2FzZSBDU1NQcm9wZXJ0eUlEOjpDU1NQcm9wZXJ0eVdpZHRoOgogICAg ICAgICBzd2l0Y2ggKGlkMikgewogICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3Bl cnR5QmxvY2tTaXplOgogICAgICAgICBjYXNlIENTU1Byb3BlcnR5SUQ6OkNTU1Byb3BlcnR5SW5s aW5lU2l6ZToKQEAgLTM2NzEsOCArMzY3MSw3IEBACiAKIGJvb2wgb3BlcmF0b3I9PShjb25zdCBD U1NQcm9wZXJ0eVNldHRpbmdzJiBhLCBjb25zdCBDU1NQcm9wZXJ0eVNldHRpbmdzJiBiKQogewot ICAgIHJldHVybiB0cnVlCi0gICAgICAgICYmIGEuQ1NTT01WaWV3U21vb3RoU2Nyb2xsaW5nRW5h YmxlZCA9PSBiLkNTU09NVmlld1Ntb290aFNjcm9sbGluZ0VuYWJsZWQKKyAgICByZXR1cm4gYS5D U1NPTVZpZXdTbW9vdGhTY3JvbGxpbmdFbmFibGVkID09IGIuQ1NTT01WaWV3U21vb3RoU2Nyb2xs aW5nRW5hYmxlZAogICAgICAgICAmJiBhLmFjY2VudENvbG9yRW5hYmxlZCA9PSBiLmFjY2VudENv bG9yRW5hYmxlZAogICAgICAgICAmJiBhLmFzcGVjdFJhdGlvRW5hYmxlZCA9PSBiLmFzcGVjdFJh dGlvRW5hYmxlZAogICAgICAgICAmJiBhLmNvbG9yRmlsdGVyRW5hYmxlZCA9PSBiLmNvbG9yRmls dGVyRW5hYmxlZApAQCAtMzY4OSwxNCArMzY4OCwxMiBAQAogICAgICAgICAmJiBhLmNzc1RleHRK dXN0aWZ5RW5hYmxlZCA9PSBiLmNzc1RleHRKdXN0aWZ5RW5hYmxlZAogICAgICAgICAmJiBhLm92 ZXJzY3JvbGxCZWhhdmlvckVuYWJsZWQgPT0gYi5vdmVyc2Nyb2xsQmVoYXZpb3JFbmFibGVkCiAg ICAgICAgICYmIGEudGV4dEF1dG9zaXppbmdFbmFibGVkID09IGIudGV4dEF1dG9zaXppbmdFbmFi bGVkCi0gICAgICAgICYmIGEud2ViQW5pbWF0aW9uc0NvbXBvc2l0ZU9wZXJhdGlvbnNFbmFibGVk ID09IGIud2ViQW5pbWF0aW9uc0NvbXBvc2l0ZU9wZXJhdGlvbnNFbmFibGVkCi0gICAgOworICAg ICAgICAmJiBhLndlYkFuaW1hdGlvbnNDb21wb3NpdGVPcGVyYXRpb25zRW5hYmxlZCA9PSBiLndl YkFuaW1hdGlvbnNDb21wb3NpdGVPcGVyYXRpb25zRW5hYmxlZDsKIH0KIAogdm9pZCBhZGQoSGFz aGVyJiBoYXNoZXIsIGNvbnN0IENTU1Byb3BlcnR5U2V0dGluZ3MmIHNldHRpbmdzKQogewotICAg IHVuc2lnbmVkIGJpdHMgPSAwCi0gICAgICAgIHwgc2V0dGluZ3MuQ1NTT01WaWV3U21vb3RoU2Ny b2xsaW5nRW5hYmxlZCA8PCAwCisgICAgdW5zaWduZWQgYml0cyA9IHNldHRpbmdzLkNTU09NVmll d1Ntb290aFNjcm9sbGluZ0VuYWJsZWQgPDwgMAogICAgICAgICB8IHNldHRpbmdzLmFjY2VudENv bG9yRW5hYmxlZCA8PCAxCiAgICAgICAgIHwgc2V0dGluZ3MuYXNwZWN0UmF0aW9FbmFibGVkIDw8 IDIKICAgICAgICAgfCBzZXR0aW5ncy5jb2xvckZpbHRlckVuYWJsZWQgPDwgMwpAQCAtMzcxMyw4 ICszNzEwLDcgQEAKICAgICAgICAgfCBzZXR0aW5ncy5jc3NUZXh0SnVzdGlmeUVuYWJsZWQgPDwg MTQKICAgICAgICAgfCBzZXR0aW5ncy5vdmVyc2Nyb2xsQmVoYXZpb3JFbmFibGVkIDw8IDE1CiAg ICAgICAgIHwgc2V0dGluZ3MudGV4dEF1dG9zaXppbmdFbmFibGVkIDw8IDE2Ci0gICAgICAgIHwg c2V0dGluZ3Mud2ViQW5pbWF0aW9uc0NvbXBvc2l0ZU9wZXJhdGlvbnNFbmFibGVkIDw8IDE3Ci0g ICAgOworICAgICAgICB8IHNldHRpbmdzLndlYkFuaW1hdGlvbnNDb21wb3NpdGVPcGVyYXRpb25z RW5hYmxlZCA8PCAxNzsKICAgICBhZGQoaGFzaGVyLCBiaXRzKTsKIH0KIApkaWZmIC11IGV4aXN0 aW5nL0NTU1Byb3BlcnR5TmFtZXMuaCBuZXdzdHVmZi9DU1NQcm9wZXJ0eU5hbWVzLmgKLS0tIGV4 aXN0aW5nL0NTU1Byb3BlcnR5TmFtZXMuaAkyMDIyLTExLTA2IDEyOjE4OjIxCisrKyBuZXdzdHVm Zi9DU1NQcm9wZXJ0eU5hbWVzLmgJMjAyMi0xMS0wNiAxMjo0NzozMgpAQCAtMSw0ICsxLDQgQEAK LS8vIFRoaXMgZmlsZSBpcyBhdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRp ZXMuanNvbiBieSB0aGUgbWFrZXByb3AucGwgc2NyaXB0LiBEbyBub3QgZWRpdCBpdC4KKy8vIFRo aXMgZmlsZSBpcyBhdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNv biBieSB0aGUgcHJvY2Vzcy1jc3MtcHJvcGVydGllcyBzY3JpcHQuIERvIG5vdCBlZGl0IGl0Lgog CiAjcHJhZ21hIG9uY2UKIApAQCAtNjI2LDMgKzYyNiw0IEBACiB0ZW1wbGF0ZTw+IHN0cnVjdCBp dGVyYXRvcl90cmFpdHM8V2ViQ29yZTo6QWxsTG9uZ2hhbmRDU1NQcm9wZXJ0aWVzUmFuZ2U6Okl0 ZXJhdG9yPiB7IHVzaW5nIHZhbHVlX3R5cGUgPSBXZWJDb3JlOjpDU1NQcm9wZXJ0eUlEOyB9Owog CiB9CisKZGlmZiAtdSBleGlzdGluZy9DU1NTdHlsZURlY2xhcmF0aW9uK1Byb3BlcnR5TmFtZXMu aWRsIG5ld3N0dWZmL0NTU1N0eWxlRGVjbGFyYXRpb24rUHJvcGVydHlOYW1lcy5pZGwKLS0tIGV4 aXN0aW5nL0NTU1N0eWxlRGVjbGFyYXRpb24rUHJvcGVydHlOYW1lcy5pZGwJMjAyMi0xMS0wNiAx MjoxODoyMAorKysgbmV3c3R1ZmYvQ1NTU3R5bGVEZWNsYXJhdGlvbitQcm9wZXJ0eU5hbWVzLmlk bAkyMDIyLTExLTA2IDEyOjQ3OjMyCkBAIC0xLDQgKzEsNCBAQAotLy8gVGhpcyBmaWxlIGlzIGF1 dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBtYWtl cHJvcC5wbCBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LgorLy8gVGhpcyBmaWxlIGlzIGF1dG9tYXRp Y2FsbHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29uIGJ5IHRoZSBwcm9jZXNzLWNz cy1wcm9wZXJ0aWVzIHNjcmlwdC4gRG8gbm90IGVkaXQgaXQuCiAKIHR5cGVkZWYgVVNWU3RyaW5n IENTU09NU3RyaW5nOwogCkBAIC0xNDA5LDQgKzE0MDksMyBAQAogICAgIFtDRVJlYWN0aW9ucywg RGVsZWdhdGVUb1NoYXJlZFN5bnRoZXRpY0F0dHJpYnV0ZT1wcm9wZXJ0eVZhbHVlRm9yRXB1YkNh c2VkSURMQXR0cmlidXRlLCBDYWxsV2l0aD1Qcm9wZXJ0eU5hbWVdIGF0dHJpYnV0ZSBbTGVnYWN5 TnVsbFRvRW1wdHlTdHJpbmddIENTU09NU3RyaW5nIGVwdWJXb3JkQnJlYWs7CiAgICAgW0NFUmVh Y3Rpb25zLCBEZWxlZ2F0ZVRvU2hhcmVkU3ludGhldGljQXR0cmlidXRlPXByb3BlcnR5VmFsdWVG b3JFcHViQ2FzZWRJRExBdHRyaWJ1dGUsIENhbGxXaXRoPVByb3BlcnR5TmFtZV0gYXR0cmlidXRl IFtMZWdhY3lOdWxsVG9FbXB0eVN0cmluZ10gQ1NTT01TdHJpbmcgZXB1YldyaXRpbmdNb2RlOwog fTsKLQpkaWZmIC11IGV4aXN0aW5nL1N0eWxlQnVpbGRlckdlbmVyYXRlZC5jcHAgbmV3c3R1ZmYv U3R5bGVCdWlsZGVyR2VuZXJhdGVkLmNwcAotLS0gZXhpc3RpbmcvU3R5bGVCdWlsZGVyR2VuZXJh dGVkLmNwcAkyMDIyLTExLTA2IDEyOjE4OjIwCisrKyBuZXdzdHVmZi9TdHlsZUJ1aWxkZXJHZW5l cmF0ZWQuY3BwCTIwMjItMTEtMDYgMTI6NDc6MzIKQEAgLTEsNCArMSw0IEBACi0vLyBUaGlzIGZp bGUgaXMgYXV0b21hdGljYWxseSBnZW5lcmF0ZWQgZnJvbSBDU1NQcm9wZXJ0aWVzLmpzb24gYnkg dGhlIG1ha2Vwcm9wLnBsIHNjcmlwdC4gRG8gbm90IGVkaXQgaXQuCisvLyBUaGlzIGZpbGUgaXMg YXV0b21hdGljYWxseSBnZW5lcmF0ZWQgZnJvbSBDU1NQcm9wZXJ0aWVzLmpzb24gYnkgdGhlIHBy b2Nlc3MtY3NzLXByb3BlcnRpZXMgc2NyaXB0LiBEbyBub3QgZWRpdCBpdC4KIAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2luY2x1ZGUgIlN0eWxlQnVpbGRlckdlbmVyYXRlZC5oIgpAQCAtODcxOCw3 ICs4NzE4LDcgQEAKICAgICAgICAgQVNTRVJUKGlzU2hvcnRoYW5kQ1NTUHJvcGVydHkoaWQpKTsK ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIGJyZWFrOwotICAgIH07Cisg ICAgfQogfQogCiB9IC8vIG5hbWVzcGFjZSBTdHlsZQpkaWZmIC11IGV4aXN0aW5nL1N0eWxlUHJv cGVydHlTaG9ydGhhbmRGdW5jdGlvbnMuY3BwIG5ld3N0dWZmL1N0eWxlUHJvcGVydHlTaG9ydGhh bmRGdW5jdGlvbnMuY3BwCi0tLSBleGlzdGluZy9TdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rp b25zLmNwcAkyMDIyLTExLTA2IDEyOjE4OjIwCisrKyBuZXdzdHVmZi9TdHlsZVByb3BlcnR5U2hv cnRoYW5kRnVuY3Rpb25zLmNwcAkyMDIyLTExLTA2IDEyOjQ3OjMyCkBAIC0xLDQgKzEsNCBAQAot Ly8gVGhpcyBmaWxlIGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGll cy5qc29uIGJ5IHRoZSBtYWtlcHJvcC5wbCBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LgorLy8gVGhp cyBmaWxlIGlzIGF1dG9tYXRpY2FsbHkgZ2VuZXJhdGVkIGZyb20gQ1NTUHJvcGVydGllcy5qc29u IGJ5IHRoZSBwcm9jZXNzLWNzcy1wcm9wZXJ0aWVzIHNjcmlwdC4gRG8gbm90IGVkaXQgaXQuIgog CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU3R5bGVQcm9wZXJ0eVNob3J0aGFuZEZ1 bmN0aW9ucy5oIgpAQCAtMTUxOSw2ICsxNTE5LDcgQEAKICAgICAgICAgcmV0dXJuIHsgfTsKICAg ICB9CiB9CisKIFN0eWxlUHJvcGVydHlTaG9ydGhhbmRWZWN0b3IgbWF0Y2hpbmdTaG9ydGhhbmRz Rm9yTG9uZ2hhbmQoQ1NTUHJvcGVydHlJRCBpZCkKIHsKICAgICBzd2l0Y2ggKGlkKSB7CkBAIC0y MDM0LDQgKzIwMzUsNSBAQAogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIH0KKwogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQpkaWZmIC11IGV4aXN0aW5nL1N0eWxlUHJvcGVydHlTaG9ydGhhbmRG dW5jdGlvbnMuaCBuZXdzdHVmZi9TdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmgKLS0t IGV4aXN0aW5nL1N0eWxlUHJvcGVydHlTaG9ydGhhbmRGdW5jdGlvbnMuaAkyMDIyLTExLTA2IDEy OjE4OjIxCisrKyBuZXdzdHVmZi9TdHlsZVByb3BlcnR5U2hvcnRoYW5kRnVuY3Rpb25zLmgJMjAy Mi0xMS0wNiAxMjo0NzozMgpAQCAtMSw0ICsxLDQgQEAKLS8vIFRoaXMgZmlsZSBpcyBhdXRvbWF0 aWNhbGx5IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUgbWFrZXByb3Au cGwgc2NyaXB0LiBEbyBub3QgZWRpdCBpdC4KKy8vIFRoaXMgZmlsZSBpcyBhdXRvbWF0aWNhbGx5 IGdlbmVyYXRlZCBmcm9tIENTU1Byb3BlcnRpZXMuanNvbiBieSB0aGUgcHJvY2Vzcy1jc3MtcHJv cGVydGllcyBzY3JpcHQuIERvIG5vdCBlZGl0IGl0LgogCiAjcHJhZ21hIG9uY2UKIAo=