178815 2017-10-25 10:55:05 -0700 Add a third benchmark to TailBench 2017-11-15 12:58:59 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Enhancement --- 1 rmorisset rmorisset buildbot cdumez commit-queue lforschler rniwa saam webkit-bug-importer oldest_to_newest 1364310 0 rmorisset 2017-10-25 10:55:05 -0700 JavascriptCore currently has two tail-call focused benchmarks: TailBench9000/merge-sort.js and TailBench9000/n-body.js. I have found it useful to have a third data point when running some performance experiment (such as in the comments of https://bugs.webkit.org/show_bug.cgi?id=178389). 1364319 1 324852 rmorisset 2017-10-25 11:11:03 -0700 Created attachment 324852 Patch 1364392 2 324852 saam 2017-10-25 12:34:59 -0700 Comment on attachment 324852 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=324852&action=review > Tools/ChangeLog:8 > + Add a new benchmark to TailBench: a brainfuck interpreter written in a weird kinda functional style perhaps better not to use "fuck" in a changelog entry > PerformanceTests/ChangeLog:8 > + Add a new benchmark to TailBench: a brainfuck interpreter written in a weird kinda functional style perhaps better not to use "fuck" in a changelog entry 1368585 3 326113 rmorisset 2017-11-06 04:27:17 -0800 Created attachment 326113 Patch for landing 1368589 4 326113 commit-queue 2017-11-06 04:58:46 -0800 Comment on attachment 326113 Patch for landing Clearing flags on attachment: 326113 Committed r224486: <https://trac.webkit.org/changeset/224486> 1368590 5 commit-queue 2017-11-06 04:58:47 -0800 All reviewed patches have been landed. Closing bug. 1372294 6 webkit-bug-importer 2017-11-15 12:58:59 -0800 <rdar://problem/35568536> 324852 2017-10-25 11:11:03 -0700 2017-11-06 04:27:13 -0800 Patch bug-178815-20171025201058.patch text/plain 6026 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzODM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTNkNDBkODg4N2VhZTA3YjIxMjBlMzExYjJiMmUzNWFj YWMzMWI3OC4uMGRlYmI1M2VmYjE5OTgxNDMyYWFkMjdlMDZmMjk3YzBlYjllMmYwOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE3LTEwLTI1ICBSb2JpbiBNb3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIGEgdGhpcmQgYmVuY2htYXJrIHRvIFRhaWxCZW5jaAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4ODE1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbmV3IGJlbmNobWFyayB0 byBUYWlsQmVuY2g6IGEgYnJhaW5mdWNrIGludGVycHJldGVyIHdyaXR0ZW4gaW4gYSB3ZWlyZCBr aW5kYSBmdW5jdGlvbmFsIHN0eWxlCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qc2MtYmVuY2ht YXJrczoKKwogMjAxNy0xMC0yMyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUuY29t PgogCiAgICAgICAgIFN1cHBvcnQgdGhlIFRhaWxCZW5jaDkwMDAgYmVuY2htYXJrIGluIHJ1bi1q c2MtYmVuY2htYXJrcwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLWJlbmNobWFy a3MgYi9Ub29scy9TY3JpcHRzL3J1bi1qc2MtYmVuY2htYXJrcwppbmRleCBjMzRmMWNiNjk5ODBi Y2Q4YzI5MzNlYmU3MTVlN2Y5ZjQxYmIyZjNlLi4xYmI0ZWI1ZDg2OGQ2ZWI1ODU5MDEyMTE2MTY2 Mjc1ZDZlZGY1MzAxIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1qc2MtYmVuY2htYXJr cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi1qc2MtYmVuY2htYXJrcwpAQCAtMzAzNyw3ICszMDM3 LDcgQEAgYmVnaW4KICAgfQogCiAgIFRBSUxCRU5DSCA9IEJlbmNobWFya1N1aXRlLm5ldygiVGFp bEJlbmNoIiwgOmdlb21ldHJpY01lYW4sIDApCi0gIFsibi1ib2R5IiwgIm1lcmdlLXNvcnQiXS5l YWNoIHsKKyAgWyJuLWJvZHkiLCAibWVyZ2Utc29ydCIsICJiZi1pbnRlcnByZXRlciJdLmVhY2gg ewogICAgIHwgbmFtZSB8CiAgICAgVEFJTEJFTkNILmFkZCBUYWlsQmVuY2hCZW5jaG1hcmsubmV3 KG5hbWUpOwogICB9CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZyBiL1Bl cmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGI2ZTY4ZWU3ZTM1YTA4NGUzOTVhZTFjOGE0 ZGMzMGEwZTkwMzFlYWYuLjFmY2Q1MDI2NDdjZGM0ZjI3MWU3NTRmYWQzMGFhYmQ0ZDBjM2E4Yjkg MTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisrKyBiL1BlcmZvcm1hbmNl VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTctMTAtMjUgIFJvYmluIE1vcmlz c2V0ICA8cm1vcmlzc2V0QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSB0aGlyZCBiZW5jaG1h cmsgdG8gVGFpbEJlbmNoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNzg4MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgYSBuZXcgYmVuY2htYXJrIHRvIFRhaWxCZW5jaDogYSBicmFpbmZ1Y2sgaW50 ZXJwcmV0ZXIgd3JpdHRlbiBpbiBhIHdlaXJkIGtpbmRhIGZ1bmN0aW9uYWwgc3R5bGUKKworICAg ICAgICAqIFRhaWxCZW5jaDkwMDAvYmYtaW50ZXJwcmV0ZXIuanM6IEFkZGVkLgorICAgICAgICAo bG9va0Zvck1hdGNoaW5nQnJhY2tldCk6CisgICAgICAgIChldmFsUmVjKToKKyAgICAgICAgKGlu ZmluaXRlVGFwZSk6CisgICAgICAgIChldmFsU2hvcnQpOgorCiAyMDE3LTEwLTIzICBSb2JpbiBN b3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCB0aGUgVGFp bEJlbmNoOTAwMCBiZW5jaG1hcmsgaW4gcnVuLWpzYy1iZW5jaG1hcmtzCmRpZmYgLS1naXQgYS9Q ZXJmb3JtYW5jZVRlc3RzL1RhaWxCZW5jaDkwMDAvYmYtaW50ZXJwcmV0ZXIuanMgYi9QZXJmb3Jt YW5jZVRlc3RzL1RhaWxCZW5jaDkwMDAvYmYtaW50ZXJwcmV0ZXIuanMKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uODE4 YzgxYTMxOTAxZDRhNDkxMmI5MWQ4MmVmMzdkODMzZDJiNzE2MgotLS0gL2Rldi9udWxsCisrKyBi L1BlcmZvcm1hbmNlVGVzdHMvVGFpbEJlbmNoOTAwMC9iZi1pbnRlcnByZXRlci5qcwpAQCAtMCww ICsxLDc5IEBACisidXNlIHN0cmljdCI7CisKK2Z1bmN0aW9uIGxvb2tGb3JNYXRjaGluZ0JyYWNr ZXQocHJvZ3JhbSwgcGMsIGxldmVsKSB7CisgICAgaWYgKHBjID49IHByb2dyYW0ubGVuZ3RoKQor ICAgICAgICB0aHJvdyAiRXJyb3I6IFVuYmFsYW5jZWQgYnJhY2tldHMgaW4gdGhlIEJGIHByb2dy YW0sIHRvbyBtYW55IG9wZW5pbmcgYnJhY2tldHMiOworICAgIAorICAgIHN3aXRjaChwcm9ncmFt W3BjXSkgeworICAgICAgICBjYXNlICdbJzoKKyAgICAgICAgICAgIHJldHVybiBsb29rRm9yTWF0 Y2hpbmdCcmFja2V0KHByb2dyYW0sIHBjKzEsIGxldmVsKzEpOworICAgICAgICBjYXNlICddJzoK KyAgICAgICAgICAgIGlmIChsZXZlbCA9PSAxKQorICAgICAgICAgICAgICAgIHJldHVybiBwYzsK KyAgICAgICAgICAgIHJldHVybiBsb29rRm9yTWF0Y2hpbmdCcmFja2V0KHByb2dyYW0sIHBjKzEs IGxldmVsLTEpOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgcmV0dXJuIGxvb2tGb3JN YXRjaGluZ0JyYWNrZXQocHJvZ3JhbSwgcGMrMSwgbGV2ZWwpOworICAgIH0KK30KKworLy8gKGxl ZnRUYXBlLCB0YXBlQ3Vyc29yLCByaWdodFRhcGUpIGZvcm0gYSB6aXBwZXI6CisvLyBsZWZ0VGFw ZSBpcyB0aGUgKGluZmluaXRlKSBsaXN0IG9mIGFsbCB2YWx1ZXMgdG8gdGhlIGxlZnQgb2YgdGhl IGN1cnNvciAoZnJvbSByaWdodCB0byBsZWZ0KSwKKy8vIHdoaWxlIHJpZ2h0VGFwZSBpcyB0aGUg KGluZmluaXRlKSBsaXN0IG9mIGFsbCB2YWx1ZXMgdG8gdGhlIHJpZ2h0IG9mIHRoZSBjdXJzb3Ig KGZyb20gbGVmdCB0byByaWdodCkuCisvLyBUaGVzZSBsaXN0cyBhcmUgcmVwcmVzZW50ZWQgYXMg ZnVuY3Rpb25zIHRoYXQgcmV0dXJuIGFuIG9iamVjdCB3aXRoIHRoZSBmaXJzdCB2YWx1ZSwgYW5k IGEgZnVuY3Rpb24gZm9yIHRoZSByZXN0IG9mIHRoZSBsaXN0LgorZnVuY3Rpb24gZXZhbFJlYyhw cm9ncmFtLCBwYywgaW5wdXQsIG91dHB1dCwgbGVmdFRhcGUsIHRhcGVDdXJzb3IsIHJpZ2h0VGFw ZSwgbG9vcENvbnRpbnVhdGlvbikKK3sKKyAgICBpZiAocGMgPj0gcHJvZ3JhbS5sZW5ndGgpCisg ICAgICAgIHJldHVybiBvdXRwdXQ7CisKKyAgICBzd2l0Y2gocHJvZ3JhbVtwY10pIHsKKyAgICBj YXNlICcuJzoKKyAgICAgICAgY29uc3QgbmV3T3V0cHV0ID0gb3V0cHV0LmNvbmNhdChTdHJpbmcu ZnJvbUNoYXJDb2RlKHRhcGVDdXJzb3IpKTsKKyAgICAgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3Jh bSwgcGMrMSwgaW5wdXQsIG5ld091dHB1dCwgbGVmdFRhcGUsIHRhcGVDdXJzb3IsIHJpZ2h0VGFw ZSwgbG9vcENvbnRpbnVhdGlvbik7CisgICAgY2FzZSAnLCc6CisgICAgICAgIHJldHVybiBldmFs UmVjKHByb2dyYW0sIHBjKzEsIGlucHV0LnNsaWNlKDEpLCBvdXRwdXQsIGxlZnRUYXBlLCBpbnB1 dC5jaGFyQ29kZUF0KDApLCByaWdodFRhcGUsIGxvb3BDb250aW51YXRpb24pOworICAgIGNhc2Ug JysnOgorICAgICAgICByZXR1cm4gZXZhbFJlYyhwcm9ncmFtLCBwYysxLCBpbnB1dCwgb3V0cHV0 LCBsZWZ0VGFwZSwgdGFwZUN1cnNvcisxLCByaWdodFRhcGUsIGxvb3BDb250aW51YXRpb24pOwor ICAgIGNhc2UgJy0nOgorICAgICAgICByZXR1cm4gZXZhbFJlYyhwcm9ncmFtLCBwYysxLCBpbnB1 dCwgb3V0cHV0LCBsZWZ0VGFwZSwgdGFwZUN1cnNvci0xLCByaWdodFRhcGUsIGxvb3BDb250aW51 YXRpb24pOworICAgIGNhc2UgJz4nOgorICAgICAgICBjb25zdCBldmFsdWF0ZWRSaWdodFRhcGUg PSByaWdodFRhcGUoKTsKKyAgICAgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3JhbSwgcGMrMSwgaW5w dXQsIG91dHB1dCwgKCk9Pih7Y3Vyc29yOiB0YXBlQ3Vyc29yLCByZXN0OiBsZWZ0VGFwZX0pLCBl dmFsdWF0ZWRSaWdodFRhcGUuY3Vyc29yLCBldmFsdWF0ZWRSaWdodFRhcGUucmVzdCwgbG9vcENv bnRpbnVhdGlvbik7CisgICAgY2FzZSAnPCc6CisgICAgICAgIGNvbnN0IGV2YWx1YXRlZExlZnRU YXBlID0gbGVmdFRhcGUoKTsKKyAgICAgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3JhbSwgcGMrMSwg aW5wdXQsIG91dHB1dCwgZXZhbHVhdGVkTGVmdFRhcGUucmVzdCwgZXZhbHVhdGVkTGVmdFRhcGUu Y3Vyc29yLCAoKT0+KHtjdXJzb3I6IHRhcGVDdXJzb3IsIHJlc3Q6IHJpZ2h0VGFwZX0pLCBsb29w Q29udGludWF0aW9uKTsKKyAgICBjYXNlICdbJzoKKyAgICAgICAgY29uc3QgbWF0Y2hpbmdQQyA9 IGxvb2tGb3JNYXRjaGluZ0JyYWNrZXQocHJvZ3JhbSwgcGMsIDApOworICAgICAgICBpZiAodGFw ZUN1cnNvciA9PSAwKQorICAgICAgICAgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3JhbSwgbWF0Y2hp bmdQQysxLCBpbnB1dCwgb3V0cHV0LCBsZWZ0VGFwZSwgdGFwZUN1cnNvciwgcmlnaHRUYXBlLCBs b29wQ29udGludWF0aW9uKTsKKyAgICAgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3JhbSwgcGMrMSwg aW5wdXQsIG91dHB1dCwgbGVmdFRhcGUsIHRhcGVDdXJzb3IsIHJpZ2h0VGFwZSwgKC4uLnZhcmFy Z3MpID0+IGV2YWxSZWMocHJvZ3JhbSwgcGMsIC4uLnZhcmFyZ3MsIGxvb3BDb250aW51YXRpb24p KTsKKyAgICBjYXNlICddJzoKKyAgICAgICAgcmV0dXJuIGxvb3BDb250aW51YXRpb24oaW5wdXQs IG91dHB1dCwgbGVmdFRhcGUsIHRhcGVDdXJzb3IsIHJpZ2h0VGFwZSk7CisgICAgZGVmYXVsdDoK KyAgICAgICAgdGhyb3cgIlVuc3VwcG9ydGVkIGNoYXJhY3RlcjogIiArIHByb2dyYW1bcGNdICsg IiBhdCBwYyAiICsgcGM7CisgICAgfQorfQorCitmdW5jdGlvbiBpbmZpbml0ZVRhcGUoKQorewor ICAgIHJldHVybiB7Y3Vyc29yOiAwLCByZXN0OiBpbmZpbml0ZVRhcGV9OworfQorCitmdW5jdGlv biBldmFsU2hvcnQocHJvZ3JhbSwgaW5wdXQpCit7CisgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3Jh bSwgMCwgaW5wdXQsICIiLCBpbmZpbml0ZVRhcGUsIDAsIGluZmluaXRlVGFwZSwgKCk9Pnt0aHJv dyAiRXJyb3I6IFVuYmFsYW5jZWQgYnJhY2tldHMgaW4gdGhlIEJGIHByb2dyYW0sIHRvbyBtYW55 IGNsb3NpbmcgYnJhY2tldHMiO30pOworfQorCitmdW5jdGlvbiB0ZXN0KHByb2dyYW0sIGlucHV0 LCBleHBlY3RlZE91dHB1dCkKK3sKKyAgICBjb25zdCByZXN1bHQgPSBldmFsU2hvcnQocHJvZ3Jh bSwgaW5wdXQpOworICAgIGlmIChyZXN1bHQgIT0gZXhwZWN0ZWRPdXRwdXQpCisgICAgICAgIHRo cm93ICgiV3JvbmcgcmVzdWx0LCBwcm9ncmFtOiAiICsgcHJvZ3JhbSArICIgb24gaW5wdXQgIiAr IGlucHV0ICsgIiBoYWQgb3V0cHV0ICIgKyByZXN1bHQgKyAiIGluc3RlYWQgb2YgIiArIGV4cGVj dGVkT3V0cHV0KTsKK30KKworZm9yICh2YXIgaSA9IDA7IGkgPCA1MDAwMDsgKytpKSB7CisgICAg dGVzdCgiLC4uLiIsICJBIiwgIkFBQSIpOworICAgIHRlc3QoIiwuLisuLi0tLiIsICJDIiwgIkND RERCIik7CisgICAgdGVzdCgiLDwsPi4uPC4uIiwgIkVGIiwgIkVFRkYiKTsKKyAgICAvLyBUaGUg Zm9sbG93aW5nIHByb2dyYW0gaXMgdGFrZW4gZnJvbSB0aGUgV2lraXBlZGlhIGJyYWluZnVjayBw YWdlOgorICAgIHRlc3QoIisrKysrKysrKytbPisrKysrKys+KysrKysrKysrKz4rKys+Kzw8PDwt XT4rKy4+Ky4rKysrKysrLi4rKysuPisrLjw8KysrKysrKysrKysrKysrLj4uKysrLi0tLS0tLS4t LS0tLS0tLS4+Ky4+LiIsICIiLCAiSGVsbG8gV29ybGQhXG4iKQorfQo= 326113 2017-11-06 04:27:17 -0800 2017-11-06 04:58:46 -0800 Patch for landing bug-178815-20171106132716.patch text/plain 5961 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NDg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDRjOGIzNmZhMDYyNTg3NDE3M2U1NWNjNjhkMWNmNzFi NmRjMjJhZC4uNWE3YjQ4MzI5MjdiODZhN2M0NzFiNDA5Zjg5M2U0ZjE4YzlhNDA2NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE3LTExLTA2ICBSb2JpbiBNb3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkIGEgdGhpcmQgYmVuY2htYXJrIHRvIFRhaWxCZW5jaAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4ODE1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisKKyAgICAgICAgQWRkIGEgbmV3IGJlbmNobWFyayB0byBU YWlsQmVuY2g6IGEgQkYgaW50ZXJwcmV0ZXIgd3JpdHRlbiBpbiBhIHdlaXJkIGtpbmRhIGZ1bmN0 aW9uYWwgc3R5bGUKKworICAgICAgICAqIFNjcmlwdHMvcnVuLWpzYy1iZW5jaG1hcmtzOgorCiAy MDE3LTExLTA0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLXSBGaXggZ3RrLWRvYyBnZW5lcmF0aW9uIHdpdGggZ3RrLWRvYyBtYXN0ZXIK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWpzYy1iZW5jaG1hcmtzIGIvVG9vbHMvU2Ny aXB0cy9ydW4tanNjLWJlbmNobWFya3MKaW5kZXggYzM0ZjFjYjY5OTgwYmNkOGMyOTMzZWJlNzE1 ZTdmOWY0MWJiMmYzZS4uMWJiNGViNWQ4NjhkNmViNTg1OTAxMjExNjE2NjI3NWQ2ZWRmNTMwMSAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tanNjLWJlbmNobWFya3MKKysrIGIvVG9vbHMv U2NyaXB0cy9ydW4tanNjLWJlbmNobWFya3MKQEAgLTMwMzcsNyArMzAzNyw3IEBAIGJlZ2luCiAg IH0KIAogICBUQUlMQkVOQ0ggPSBCZW5jaG1hcmtTdWl0ZS5uZXcoIlRhaWxCZW5jaCIsIDpnZW9t ZXRyaWNNZWFuLCAwKQotICBbIm4tYm9keSIsICJtZXJnZS1zb3J0Il0uZWFjaCB7CisgIFsibi1i b2R5IiwgIm1lcmdlLXNvcnQiLCAiYmYtaW50ZXJwcmV0ZXIiXS5lYWNoIHsKICAgICB8IG5hbWUg fAogICAgIFRBSUxCRU5DSC5hZGQgVGFpbEJlbmNoQmVuY2htYXJrLm5ldyhuYW1lKTsKICAgfQpk aWZmIC0tZ2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9DaGFuZ2VMb2cgYi9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwppbmRleCBhYjIwNTlhZTQ0ZTFhM2JhNDgwMmJjN2ZmMTkxOTg5MjUxZmM5YTc3 Li5jNTJlM2EzYzgxZjg1ZWMzNzk3MWNjYjQ3ZWMzZTYxZmZiNDA0Nzc4IDEwMDY0NAotLS0gYS9Q ZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxvZworKysgYi9QZXJmb3JtYW5jZVRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTExLTA2ICBSb2JpbiBNb3Jpc3NldCAgPHJtb3Jpc3Nl dEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgdGhpcmQgYmVuY2htYXJrIHRvIFRhaWxCZW5j aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc4ODE1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisKKyAgICAgICAgQWRkIGEgbmV3 IGJlbmNobWFyayB0byBUYWlsQmVuY2g6IGEgQkYgaW50ZXJwcmV0ZXIgd3JpdHRlbiBpbiBhIHdl aXJkIGtpbmRhIGZ1bmN0aW9uYWwgc3R5bGUKKworICAgICAgICAqIFRhaWxCZW5jaDkwMDAvYmYt aW50ZXJwcmV0ZXIuanM6IEFkZGVkLgorICAgICAgICAobG9va0Zvck1hdGNoaW5nQnJhY2tldCk6 CisgICAgICAgIChldmFsUmVjKToKKyAgICAgICAgKGluZmluaXRlVGFwZSk6CisgICAgICAgIChl dmFsU2hvcnQpOgorCiAyMDE3LTExLTAyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgbGljZW5zZSBmb3IgTW90aW9uTWFyawpkaWZmIC0tZ2l0IGEvUGVyZm9ybWFu Y2VUZXN0cy9UYWlsQmVuY2g5MDAwL2JmLWludGVycHJldGVyLmpzIGIvUGVyZm9ybWFuY2VUZXN0 cy9UYWlsQmVuY2g5MDAwL2JmLWludGVycHJldGVyLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjgxOGM4MWEzMTkw MWQ0YTQ5MTJiOTFkODJlZjM3ZDgzM2QyYjcxNjIKLS0tIC9kZXYvbnVsbAorKysgYi9QZXJmb3Jt YW5jZVRlc3RzL1RhaWxCZW5jaDkwMDAvYmYtaW50ZXJwcmV0ZXIuanMKQEAgLTAsMCArMSw3OSBA QAorInVzZSBzdHJpY3QiOworCitmdW5jdGlvbiBsb29rRm9yTWF0Y2hpbmdCcmFja2V0KHByb2dy YW0sIHBjLCBsZXZlbCkgeworICAgIGlmIChwYyA+PSBwcm9ncmFtLmxlbmd0aCkKKyAgICAgICAg dGhyb3cgIkVycm9yOiBVbmJhbGFuY2VkIGJyYWNrZXRzIGluIHRoZSBCRiBwcm9ncmFtLCB0b28g bWFueSBvcGVuaW5nIGJyYWNrZXRzIjsKKyAgICAKKyAgICBzd2l0Y2gocHJvZ3JhbVtwY10pIHsK KyAgICAgICAgY2FzZSAnWyc6CisgICAgICAgICAgICByZXR1cm4gbG9va0Zvck1hdGNoaW5nQnJh Y2tldChwcm9ncmFtLCBwYysxLCBsZXZlbCsxKTsKKyAgICAgICAgY2FzZSAnXSc6CisgICAgICAg ICAgICBpZiAobGV2ZWwgPT0gMSkKKyAgICAgICAgICAgICAgICByZXR1cm4gcGM7CisgICAgICAg ICAgICByZXR1cm4gbG9va0Zvck1hdGNoaW5nQnJhY2tldChwcm9ncmFtLCBwYysxLCBsZXZlbC0x KTsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHJldHVybiBsb29rRm9yTWF0Y2hpbmdC cmFja2V0KHByb2dyYW0sIHBjKzEsIGxldmVsKTsKKyAgICB9Cit9CisKKy8vIChsZWZ0VGFwZSwg dGFwZUN1cnNvciwgcmlnaHRUYXBlKSBmb3JtIGEgemlwcGVyOgorLy8gbGVmdFRhcGUgaXMgdGhl IChpbmZpbml0ZSkgbGlzdCBvZiBhbGwgdmFsdWVzIHRvIHRoZSBsZWZ0IG9mIHRoZSBjdXJzb3Ig KGZyb20gcmlnaHQgdG8gbGVmdCksCisvLyB3aGlsZSByaWdodFRhcGUgaXMgdGhlIChpbmZpbml0 ZSkgbGlzdCBvZiBhbGwgdmFsdWVzIHRvIHRoZSByaWdodCBvZiB0aGUgY3Vyc29yIChmcm9tIGxl ZnQgdG8gcmlnaHQpLgorLy8gVGhlc2UgbGlzdHMgYXJlIHJlcHJlc2VudGVkIGFzIGZ1bmN0aW9u cyB0aGF0IHJldHVybiBhbiBvYmplY3Qgd2l0aCB0aGUgZmlyc3QgdmFsdWUsIGFuZCBhIGZ1bmN0 aW9uIGZvciB0aGUgcmVzdCBvZiB0aGUgbGlzdC4KK2Z1bmN0aW9uIGV2YWxSZWMocHJvZ3JhbSwg cGMsIGlucHV0LCBvdXRwdXQsIGxlZnRUYXBlLCB0YXBlQ3Vyc29yLCByaWdodFRhcGUsIGxvb3BD b250aW51YXRpb24pCit7CisgICAgaWYgKHBjID49IHByb2dyYW0ubGVuZ3RoKQorICAgICAgICBy ZXR1cm4gb3V0cHV0OworCisgICAgc3dpdGNoKHByb2dyYW1bcGNdKSB7CisgICAgY2FzZSAnLic6 CisgICAgICAgIGNvbnN0IG5ld091dHB1dCA9IG91dHB1dC5jb25jYXQoU3RyaW5nLmZyb21DaGFy Q29kZSh0YXBlQ3Vyc29yKSk7CisgICAgICAgIHJldHVybiBldmFsUmVjKHByb2dyYW0sIHBjKzEs IGlucHV0LCBuZXdPdXRwdXQsIGxlZnRUYXBlLCB0YXBlQ3Vyc29yLCByaWdodFRhcGUsIGxvb3BD b250aW51YXRpb24pOworICAgIGNhc2UgJywnOgorICAgICAgICByZXR1cm4gZXZhbFJlYyhwcm9n cmFtLCBwYysxLCBpbnB1dC5zbGljZSgxKSwgb3V0cHV0LCBsZWZ0VGFwZSwgaW5wdXQuY2hhckNv ZGVBdCgwKSwgcmlnaHRUYXBlLCBsb29wQ29udGludWF0aW9uKTsKKyAgICBjYXNlICcrJzoKKyAg ICAgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3JhbSwgcGMrMSwgaW5wdXQsIG91dHB1dCwgbGVmdFRh cGUsIHRhcGVDdXJzb3IrMSwgcmlnaHRUYXBlLCBsb29wQ29udGludWF0aW9uKTsKKyAgICBjYXNl ICctJzoKKyAgICAgICAgcmV0dXJuIGV2YWxSZWMocHJvZ3JhbSwgcGMrMSwgaW5wdXQsIG91dHB1 dCwgbGVmdFRhcGUsIHRhcGVDdXJzb3ItMSwgcmlnaHRUYXBlLCBsb29wQ29udGludWF0aW9uKTsK KyAgICBjYXNlICc+JzoKKyAgICAgICAgY29uc3QgZXZhbHVhdGVkUmlnaHRUYXBlID0gcmlnaHRU YXBlKCk7CisgICAgICAgIHJldHVybiBldmFsUmVjKHByb2dyYW0sIHBjKzEsIGlucHV0LCBvdXRw dXQsICgpPT4oe2N1cnNvcjogdGFwZUN1cnNvciwgcmVzdDogbGVmdFRhcGV9KSwgZXZhbHVhdGVk UmlnaHRUYXBlLmN1cnNvciwgZXZhbHVhdGVkUmlnaHRUYXBlLnJlc3QsIGxvb3BDb250aW51YXRp b24pOworICAgIGNhc2UgJzwnOgorICAgICAgICBjb25zdCBldmFsdWF0ZWRMZWZ0VGFwZSA9IGxl ZnRUYXBlKCk7CisgICAgICAgIHJldHVybiBldmFsUmVjKHByb2dyYW0sIHBjKzEsIGlucHV0LCBv dXRwdXQsIGV2YWx1YXRlZExlZnRUYXBlLnJlc3QsIGV2YWx1YXRlZExlZnRUYXBlLmN1cnNvciwg KCk9Pih7Y3Vyc29yOiB0YXBlQ3Vyc29yLCByZXN0OiByaWdodFRhcGV9KSwgbG9vcENvbnRpbnVh dGlvbik7CisgICAgY2FzZSAnWyc6CisgICAgICAgIGNvbnN0IG1hdGNoaW5nUEMgPSBsb29rRm9y TWF0Y2hpbmdCcmFja2V0KHByb2dyYW0sIHBjLCAwKTsKKyAgICAgICAgaWYgKHRhcGVDdXJzb3Ig PT0gMCkKKyAgICAgICAgICAgIHJldHVybiBldmFsUmVjKHByb2dyYW0sIG1hdGNoaW5nUEMrMSwg aW5wdXQsIG91dHB1dCwgbGVmdFRhcGUsIHRhcGVDdXJzb3IsIHJpZ2h0VGFwZSwgbG9vcENvbnRp bnVhdGlvbik7CisgICAgICAgIHJldHVybiBldmFsUmVjKHByb2dyYW0sIHBjKzEsIGlucHV0LCBv dXRwdXQsIGxlZnRUYXBlLCB0YXBlQ3Vyc29yLCByaWdodFRhcGUsICguLi52YXJhcmdzKSA9PiBl dmFsUmVjKHByb2dyYW0sIHBjLCAuLi52YXJhcmdzLCBsb29wQ29udGludWF0aW9uKSk7CisgICAg Y2FzZSAnXSc6CisgICAgICAgIHJldHVybiBsb29wQ29udGludWF0aW9uKGlucHV0LCBvdXRwdXQs IGxlZnRUYXBlLCB0YXBlQ3Vyc29yLCByaWdodFRhcGUpOworICAgIGRlZmF1bHQ6CisgICAgICAg IHRocm93ICJVbnN1cHBvcnRlZCBjaGFyYWN0ZXI6ICIgKyBwcm9ncmFtW3BjXSArICIgYXQgcGMg IiArIHBjOworICAgIH0KK30KKworZnVuY3Rpb24gaW5maW5pdGVUYXBlKCkKK3sKKyAgICByZXR1 cm4ge2N1cnNvcjogMCwgcmVzdDogaW5maW5pdGVUYXBlfTsKK30KKworZnVuY3Rpb24gZXZhbFNo b3J0KHByb2dyYW0sIGlucHV0KQoreworICAgIHJldHVybiBldmFsUmVjKHByb2dyYW0sIDAsIGlu cHV0LCAiIiwgaW5maW5pdGVUYXBlLCAwLCBpbmZpbml0ZVRhcGUsICgpPT57dGhyb3cgIkVycm9y OiBVbmJhbGFuY2VkIGJyYWNrZXRzIGluIHRoZSBCRiBwcm9ncmFtLCB0b28gbWFueSBjbG9zaW5n IGJyYWNrZXRzIjt9KTsKK30KKworZnVuY3Rpb24gdGVzdChwcm9ncmFtLCBpbnB1dCwgZXhwZWN0 ZWRPdXRwdXQpCit7CisgICAgY29uc3QgcmVzdWx0ID0gZXZhbFNob3J0KHByb2dyYW0sIGlucHV0 KTsKKyAgICBpZiAocmVzdWx0ICE9IGV4cGVjdGVkT3V0cHV0KQorICAgICAgICB0aHJvdyAoIldy b25nIHJlc3VsdCwgcHJvZ3JhbTogIiArIHByb2dyYW0gKyAiIG9uIGlucHV0ICIgKyBpbnB1dCAr ICIgaGFkIG91dHB1dCAiICsgcmVzdWx0ICsgIiBpbnN0ZWFkIG9mICIgKyBleHBlY3RlZE91dHB1 dCk7Cit9CisKK2ZvciAodmFyIGkgPSAwOyBpIDwgNTAwMDA7ICsraSkgeworICAgIHRlc3QoIiwu Li4iLCAiQSIsICJBQUEiKTsKKyAgICB0ZXN0KCIsLi4rLi4tLS4iLCAiQyIsICJDQ0REQiIpOwor ICAgIHRlc3QoIiw8LD4uLjwuLiIsICJFRiIsICJFRUZGIik7CisgICAgLy8gVGhlIGZvbGxvd2lu ZyBwcm9ncmFtIGlzIHRha2VuIGZyb20gdGhlIFdpa2lwZWRpYSBicmFpbmZ1Y2sgcGFnZToKKyAg ICB0ZXN0KCIrKysrKysrKysrWz4rKysrKysrPisrKysrKysrKys+KysrPis8PDw8LV0+KysuPisu KysrKysrKy4uKysrLj4rKy48PCsrKysrKysrKysrKysrKy4+LisrKy4tLS0tLS0uLS0tLS0tLS0u PisuPi4iLCAiIiwgIkhlbGxvIFdvcmxkIVxuIikKK30K