158497 2016-06-07 15:04:36 -0700 Use more ES6 features in JSAir 2016-06-08 11:12:11 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 158492 1 fpizlo fpizlo barraclough benjamin cdumez commit-queue ggaren joepeck keith_miller lforschler mark.lam mhahnenb msaboff oliver rniwa saam sam oldest_to_newest 1200209 0 fpizlo 2016-06-07 15:04:36 -0700 To address JoePeck's comments: https://bugs.webkit.org/show_bug.cgi?id=158318#c19 1200494 1 280813 fpizlo 2016-06-08 10:48:25 -0700 Created attachment 280813 the patch 1200502 2 280813 keith_miller 2016-06-08 11:08:25 -0700 Comment on attachment 280813 the patch r=me 1200505 3 fpizlo 2016-06-08 11:12:11 -0700 Landed in http://trac.webkit.org/changeset/201813 280813 2016-06-08 10:48:25 -0700 2016-06-08 11:08:25 -0700 the patch blah.patch text/plain 11312 fpizlo SW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1h bmNlVGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMDE4MTApCisrKyBQZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDY3IEBACisyMDE2LTA2LTA4ICBG aWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIG1vcmUgRVM2IGZl YXR1cmVzIGluIEpTQWlyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTg0OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAg ICAgICAgCisgICAgICAgIFRoaXMgaW1wcm92ZXMgSlNBaXIgd2l0aCB0aGUgZm9sbG93aW5nIEVT NiBmZWF0dXJlcyBzdWdnZXN0ZWQgYnkgSm9lUGVjazoKKyAgICAgICAgCisgICAgICAgIC0gU3Ry aW5nIGludGVycG9sYXRpb24uCisgICAgICAgIC0gRGVzdHJ1Y3R1cmluZyBpbnNpZGUgUGF0Y2hD dXN0b20uCisgICAgICAgIC0gRGVmYXVsdCBhcmd1bWVudHMuCisgICAgICAgIAorICAgICAgICBB bGwgb2YgdGhlc2UgdGhpbmdzIGFyZSBvbiBob3QgcGF0aHMuCisgICAgICAgIAorICAgICAgICBO b3RlIHRoYXQgSSBkaWRuJ3QgdXNlIHN0cmluZyBpbnRlcnBvbGF0aW9uIGV2ZXJ5d2hlcmUgdGhh dCBJIGNvdWxkLCBvbmx5IGluIHRob3NlIHBsYWNlcworICAgICAgICB3aGVyZSBpdCBtYWRlIHRo ZSBjb2RlIG1vcmUgcmVhZGFibGUuIEluIFJ1YnksIEkgdXNlZCB0aGUgc3R5bGUgdGhhdCBpZiB0 aGUgaW50ZXJwb2xhdGlvbgorICAgICAgICBleHByZXNzaW9uIGhhcyBhbnkgbm9uLXRyaXZpYWwg c3R1ZmYgKGxpa2UgYSB0ZXJuYXJ5IG9wZXJhdG9yLCBhIGNoYWluIG9mIGNhbGxzLCBvciBlbWJl ZGRlZAorICAgICAgICBzdHJpbmdzKSB0aGVuIGl0J3MgYmV0dGVyIHRvIHVzZSByZWd1bGFyIHN0 cmNhdC4gSSB0aGluayB0aGF0J3Mgd2hhdCBJIGNhcnJpZWQgb3ZlciB0byBoZXJlLgorICAgICAg ICAKKyAgICAgICAgTm90ZSB0aGF0IHRoZSBwcmV2aW91cyBjaGFuZ2UgKEFkZCByZXN1bHQgdmFs aWRhdGlvbiB0byBKU0FpcikgYWxzbyBtYWRlIHRoZSBQcm94eSBjb2RlIG5vdAorICAgICAgICBk ZWFkLCB0aG91Z2ggaXQncyBub3QgbmVjZXNzYXJpbHkgb24gdGhlIGhvdCBwYXRoLiBUaGUgUHJv eHkgaXNuJ3QgY2FsbGVkIGludG8gZnJlcXVlbnRseQorICAgICAgICBidXQgaXQncyB1c2VkIGZy b20gYSBmdW5jdGlvbiB0aGF0IGlzIG90aGVyd2lzZSBob3QsIHNvIGlmIGNhbGxpbmcgaW50byB0 aGUgUHJveHkgcHJldmVudHMKKyAgICAgICAgdGhhdCBmdW5jdGlvbiBmcm9tIGJlaW5nIG9wdGlt aXplZCB0aGVuIGl0IHdpbGwgaHVydCBzbyBnb29kLgorICAgICAgICAKKyAgICAgICAgVGhpcyBj aGFuZ2UgZG9lc24ndCBzZWVtIHRvIGNoYW5nZSB0aGUgcGVyZm9ybWFuY2Ugb2YgdGhlIGJlbmNo bWFyayBmb3IgdXMuIFRoYXQncyBleHBlY3RlZAorICAgICAgICBzaW5jZSB0aGVzZSBFUzYgZmVh dHVyZXMgYXJlIGNoZWFwLiBOb3RlIHRoYXQgdGhpcyBjbGFpbSBkb2Vzbid0IGluY2x1ZGUgUHJv eHksIHdoaWNoIHdhcworICAgICAgICBhZGRlZCBpbiBhIHNlcGFyYXRlIGNoYW5nZSBhbmQgdGhh dCBjaGFuZ2UgZGlkIG1ha2UgdGhlIGJlbmNobWFyayBvdmVyYWxsIG1vcmUgZXhwZW5zaXZlLgor CisgICAgICAgICogSlNBaXIvYWxsb2NhdGVfc3RhY2suanM6CisgICAgICAgIChhbGxvY2F0ZVN0 YWNrKToKKyAgICAgICAgKiBKU0Fpci9hcmcuanM6CisgICAgICAgIChBcmcuY3JlYXRlQml0SW1t NjQpOgorICAgICAgICAoQXJnLmNyZWF0ZUFkZHIpOgorICAgICAgICAoQXJnLmNyZWF0ZVN0YWNr KToKKyAgICAgICAgKEFyZy5sb2dTY2FsZSk6CisgICAgICAgIChBcmcuY3JlYXRlSW5kZXgpOgor ICAgICAgICAqIEpTQWlyL2Jhc2ljX2Jsb2NrLmpzOgorICAgICAgICAoQmFzaWNCbG9jay5nZXQg aGVhZGVyU3RyaW5nKToKKyAgICAgICAgKEJhc2ljQmxvY2sucHJvdG90eXBlLmdldCBpZik6Cisg ICAgICAgIChCYXNpY0Jsb2NrKToKKyAgICAgICAgKiBKU0Fpci9iZW5jaG1hcmsuanM6CisgICAg ICAgIChiZW5jaG1hcmspOgorICAgICAgICAqIEpTQWlyL2NvZGUuanM6CisgICAgICAgIChDb2Rl KToKKyAgICAgICAgKENvZGUucHJvdG90eXBlLmFkZEJsb2NrKToKKyAgICAgICAgKENvZGUucHJv dG90eXBlLmFkZFN0YWNrU2xvdCk6CisgICAgICAgIChDb2RlLnByb3RvdHlwZS5uZXdUbXApOgor ICAgICAgICAoQ29kZS5wcm90b3R5cGUuZ2V0IHNpemUpOgorICAgICAgICAoQ29kZS5wcm90b3R5 cGUuZ2V0IGJsb2Nrcyk6CisgICAgICAgIChDb2RlLnByb3RvdHlwZS5nZXQgc3RhY2tTbG90cyk6 CisgICAgICAgIChDb2RlLnByb3RvdHlwZS50bXBzKToKKyAgICAgICAgKENvZGUucHJvdG90eXBl LmdldCBjYWxsQXJnQXJlYVNpemUpOgorICAgICAgICAoQ29kZS5wcm90b3R5cGUudG9TdHJpbmcp OgorICAgICAgICAqIEpTQWlyL2N1c3RvbS5qczoKKyAgICAgICAgKGNvbnN0LlBhdGNoQ3VzdG9t LmZvckVhY2hBcmcpOgorICAgICAgICAqIEpTQWlyL2luc3QuanM6CisgICAgICAgIChJbnN0KToK KyAgICAgICAgKiBKU0Fpci9yZWcuanM6CisgICAgICAgIChSZWcucHJvdG90eXBlLnRvU3RyaW5n KToKKyAgICAgICAgKiBKU0Fpci91dGlsLmpzOgorICAgICAgICAoc3ltYm9sTmFtZSk6CisgICAg ICAgIChsb3dlclN5bWJvbE5hbWUpOgorCiAyMDE2LTA2LTA3ICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHJlc3VsdCB2YWxpZGF0aW9uIHRvIEpTQWlyCklu ZGV4OiBQZXJmb3JtYW5jZVRlc3RzL0pTQWlyL2FsbG9jYXRlX3N0YWNrLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvYWxsb2NhdGVfc3RhY2suanMJKHJldmlzaW9uIDIw MTgwNykKKysrIFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvYWxsb2NhdGVfc3RhY2suanMJKHdvcmtp bmcgY29weSkKQEAgLTIyNyw4ICsyMjcsNyBAQCBmdW5jdGlvbiBhbGxvY2F0ZVN0YWNrKGNvZGUp CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyB6ZXJvIGZpbGxzLgogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKHNsb3QuYnl0ZVNpemUgIT0gOCkgewogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRocm93IG5ldyBFcnJvcigKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IkJhZCBzcGlsbCBzbG90IHNpemUgZm9yIFpEZWY6ICIgKyBzbG90LmJ5dGVTaXplICsgIiwgd2lk dGggaXMgIiArCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aWR0aCk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGBCYWQgc3BpbGwgc2xvdCBzaXplIGZvciBa RGVmOiAke3Nsb3QuYnl0ZVNpemV9LCB3aWR0aCBpcyAke3dpZHRofWApOwogICAgICAgICAgICAg ICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHdpZHRoICE9IDMyKQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRocm93IG5ldyBFcnJvcigiQmFkIHdpZHRoIGZv ciBaRGVmIik7CkluZGV4OiBQZXJmb3JtYW5jZVRlc3RzL0pTQWlyL2FyZy5qcwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0pTQWlyL2FyZy5qcwkocmV2aXNpb24gMjAxODA3KQorKysg UGVyZm9ybWFuY2VUZXN0cy9KU0Fpci9hcmcuanMJKHdvcmtpbmcgY29weSkKQEAgLTMzMywxMCAr MzMzLDggQEAgY2xhc3MgQXJnIHsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAg Ci0gICAgc3RhdGljIGNyZWF0ZUFkZHIoYmFzZSwgb2Zmc2V0KQorICAgIHN0YXRpYyBjcmVhdGVB ZGRyKGJhc2UsIG9mZnNldCA9IDApCiAgICAgewotICAgICAgICBpZiAob2Zmc2V0ID09IG51bGwp Ci0gICAgICAgICAgICBvZmZzZXQgPSAwOwogICAgICAgICBsZXQgcmVzdWx0ID0gbmV3IEFyZygp OwogICAgICAgICByZXN1bHQuX2tpbmQgPSBBcmcuQWRkcjsKICAgICAgICAgcmVzdWx0Ll9iYXNl ID0gYmFzZTsKQEAgLTM0NCwxMCArMzQyLDggQEAgY2xhc3MgQXJnIHsKICAgICAgICAgcmV0dXJu IHJlc3VsdDsKICAgICB9CiAgICAgCi0gICAgc3RhdGljIGNyZWF0ZVN0YWNrKHNsb3QsIG9mZnNl dCkKKyAgICBzdGF0aWMgY3JlYXRlU3RhY2soc2xvdCwgb2Zmc2V0ID0gMCkKICAgICB7Ci0gICAg ICAgIGlmIChvZmZzZXQgPT0gbnVsbCkKLSAgICAgICAgICAgIG9mZnNldCA9IDA7CiAgICAgICAg IGxldCByZXN1bHQgPSBuZXcgQXJnKCk7CiAgICAgICAgIHJlc3VsdC5fa2luZCA9IEFyZy5TdGFj azsKICAgICAgICAgcmVzdWx0Ll9zbG90ID0gc2xvdDsKQEAgLTQwMCwxMiArMzk2LDggQEAgY2xh c3MgQXJnIHsKICAgICAgICAgfQogICAgIH0KICAgICAKLSAgICBzdGF0aWMgY3JlYXRlSW5kZXgo YmFzZSwgaW5kZXgsIHNjYWxlLCBvZmZzZXQpCisgICAgc3RhdGljIGNyZWF0ZUluZGV4KGJhc2Us IGluZGV4LCBzY2FsZSA9IDEsIG9mZnNldCA9IDApCiAgICAgewotICAgICAgICBpZiAoc2NhbGUg PT0gbnVsbCkKLSAgICAgICAgICAgIHNjYWxlID0gMTsKLSAgICAgICAgaWYgKG9mZnNldCA9PSBu dWxsKQotICAgICAgICAgICAgb2Zmc2V0ID0gMDsKICAgICAgICAgbGV0IHJlc3VsdCA9IG5ldyBB cmcoKTsKICAgICAgICAgcmVzdWx0Ll9raW5kID0gQXJnLkluZGV4OwogICAgICAgICByZXN1bHQu X2Jhc2UgPSBiYXNlOwpJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9KU0Fpci9iYXNpY19ibG9jay5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0pTQWlyL2Jhc2ljX2Jsb2NrLmpzCShy ZXZpc2lvbiAyMDE4MDcpCisrKyBQZXJmb3JtYW5jZVRlc3RzL0pTQWlyL2Jhc2ljX2Jsb2NrLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0xMDgsNyArMTA4LDcgQEAgY2xhc3MgQmFzaWNCbG9jayB7CiAg ICAgZ2V0IGhlYWRlclN0cmluZygpCiAgICAgewogICAgICAgICBsZXQgcmVzdWx0ID0gIiI7Ci0g ICAgICAgIHJlc3VsdCArPSAiQkIiICsgdGhpcyArICI6IDsgZnJlcXVlbmN5ID0gIiArIHRoaXMu X2ZyZXF1ZW5jeSArICJcbiI7CisgICAgICAgIHJlc3VsdCArPSBgQkIke3RoaXN9OiA7IGZyZXF1 ZW5jeSA9ICR7dGhpcy5fZnJlcXVlbmN5fVxuYDsKICAgICAgICAgaWYgKHRoaXMuX3ByZWRlY2Vz c29ycy5sZW5ndGgpCiAgICAgICAgICAgICByZXN1bHQgKz0gIiAgUHJlZGVjZXNzb3JzOiAiICsg dGhpcy5fcHJlZGVjZXNzb3JzLmpvaW4oIiwgIikgKyAiXG4iOwogICAgICAgICByZXR1cm4gcmVz dWx0OwpAQCAtMTI3LDcgKzEyNyw3IEBAIGNsYXNzIEJhc2ljQmxvY2sgewogICAgICAgICBsZXQg cmVzdWx0ID0gIiI7CiAgICAgICAgIHJlc3VsdCArPSB0aGlzLmhlYWRlclN0cmluZzsKICAgICAg ICAgZm9yIChsZXQgaW5zdCBvZiB0aGlzKQotICAgICAgICAgICAgcmVzdWx0ICs9ICIgICAgIiAr IGluc3QgKyAiXG4iOworICAgICAgICAgICAgcmVzdWx0ICs9IGAgICAgJHtpbnN0fVxuYDsKICAg ICAgICAgcmVzdWx0ICs9IHRoaXMuZm9vdGVyU3RyaW5nOwogICAgICAgICByZXR1cm4gcmVzdWx0 OwogICAgIH0KSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvYmVuY2htYXJrLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvYmVuY2htYXJrLmpzCShyZXZpc2lvbiAy MDE4MDcpCisrKyBQZXJmb3JtYW5jZVRlc3RzL0pTQWlyL2JlbmNobWFyay5qcwkod29ya2luZyBj b3B5KQpAQCAtNTIsNyArNTIsNyBAQCBmdW5jdGlvbiBiZW5jaG1hcmsoKQogICAgICAgICAgICAg CiAgICAgICAgICAgICBsZXQgaGFzaCA9IGNvZGUuaGFzaCgpOwogICAgICAgICAgICAgaWYgKGhh c2ggIT0gcGF5bG9hZC5lYXJseUhhc2gpCi0gICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9y KCJXcm9uZyBlYXJseSBoYXNoIGZvciAiICsgcGF5bG9hZC5nZW5lcmF0ZS5uYW1lICsiOiAiICsg aGFzaCk7CisgICAgICAgICAgICAgICAgdGhyb3cgbmV3IEVycm9yKGBXcm9uZyBlYXJseSBoYXNo IGZvciAke3BheWxvYWQuZ2VuZXJhdGUubmFtZX06ICR7aGFzaH1gKTsKICAgICAgICAgICAgIAog ICAgICAgICAgICAgYWxsb2NhdGVTdGFjayhjb2RlKTsKICAgICAgICAgICAgIApAQCAtNjMsNyAr NjMsNyBAQCBmdW5jdGlvbiBiZW5jaG1hcmsoKQogCiAgICAgICAgICAgICBoYXNoID0gY29kZS5o YXNoKCk7CiAgICAgICAgICAgICBpZiAoaGFzaCAhPSBwYXlsb2FkLmxhdGVIYXNoKQotICAgICAg ICAgICAgICAgIHRocm93IG5ldyBFcnJvcigiV3JvbmcgbGF0ZSBoYXNoIGZvciAiICsgcGF5bG9h ZC5nZW5lcmF0ZS5uYW1lICsiOiAiICsgaGFzaCk7CisgICAgICAgICAgICAgICAgdGhyb3cgbmV3 IEVycm9yKGBXcm9uZyBsYXRlIGhhc2ggZm9yICR7cGF5bG9hZC5nZW5lcmF0ZS5uYW1lfTogJHto YXNofWApOwogICAgICAgICB9CiAgICAgfQogICAgIApJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9K U0Fpci9jb2RlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvY29kZS5q cwkocmV2aXNpb24gMjAxODA3KQorKysgUGVyZm9ybWFuY2VUZXN0cy9KU0Fpci9jb2RlLmpzCSh3 b3JraW5nIGNvcHkpCkBAIC0zNSwyNCArMzUsMTkgQEAgY2xhc3MgQ29kZSB7CiAgICAgICAgIHRo aXMuX2ZyYW1lU2l6ZSA9IDA7CiAgICAgfQogICAgIAotICAgIGFkZEJsb2NrKGZyZXF1ZW5jeSkK KyAgICBhZGRCbG9jayhmcmVxdWVuY3kgPSAxKQogICAgIHsKLSAgICAgICAgaWYgKGZyZXF1ZW5j eSA9PSBudWxsKQotICAgICAgICAgICAgZnJlcXVlbmN5ID0gMTsKLSAgICAgICAgbGV0IHJlc3Vs dCA9IGFkZEluZGV4ZWQodGhpcy5fYmxvY2tzLCBCYXNpY0Jsb2NrLCBmcmVxdWVuY3kpOwotICAg ICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICByZXR1cm4gYWRkSW5kZXhlZCh0aGlzLl9ibG9j a3MsIEJhc2ljQmxvY2ssIGZyZXF1ZW5jeSk7CiAgICAgfQogICAgIAogICAgIGFkZFN0YWNrU2xv dChieXRlU2l6ZSwga2luZCkKICAgICB7Ci0gICAgICAgIGxldCByZXN1bHQgPSBhZGRJbmRleGVk KHRoaXMuX3N0YWNrU2xvdHMsIFN0YWNrU2xvdCwgYnl0ZVNpemUsIGtpbmQpOwotICAgICAgICBy ZXR1cm4gcmVzdWx0OworICAgICAgICByZXR1cm4gYWRkSW5kZXhlZCh0aGlzLl9zdGFja1Nsb3Rz LCBTdGFja1Nsb3QsIGJ5dGVTaXplLCBraW5kKTsKICAgICB9CiAgICAgCiAgICAgbmV3VG1wKHR5 cGUpCiAgICAgewotICAgICAgICBsZXQgcmVzdWx0ID0gYWRkSW5kZXhlZCh0aGlzWyJfIiArIHN5 bWJvbE5hbWUodHlwZSkudG9Mb3dlckNhc2UoKSArICJUbXBzIl0sIFRtcCwgdHlwZSk7Ci0gICAg ICAgIHJldHVybiByZXN1bHQ7CisgICAgICAgIHJldHVybiBhZGRJbmRleGVkKHRoaXNbYF8ke2xv d2VyU3ltYm9sTmFtZSh0eXBlKX1UbXBzYF0sIFRtcCwgdHlwZSk7CiAgICAgfQogICAgIAogICAg IGdldCBzaXplKCkgeyByZXR1cm4gdGhpcy5fYmxvY2tzLmxlbmd0aDsgfQpAQCAtNjYsNyArNjEs NyBAQCBjbGFzcyBDb2RlIHsKICAgICBnZXQgYmxvY2tzKCkgeyByZXR1cm4gdGhpcy5fYmxvY2tz OyB9CiAgICAgZ2V0IHN0YWNrU2xvdHMoKSB7IHJldHVybiB0aGlzLl9zdGFja1Nsb3RzOyB9CiAg ICAgCi0gICAgdG1wcyh0eXBlKSB7IHJldHVybiB0aGlzWyJfIiArIHN5bWJvbE5hbWUodHlwZSku dG9Mb3dlckNhc2UoKSArICJUbXBzIl07IH0KKyAgICB0bXBzKHR5cGUpIHsgcmV0dXJuIHRoaXNb YF8ke2xvd2VyU3ltYm9sTmFtZSh0eXBlKX1UbXBzYF07IH0KICAgICAKICAgICBnZXQgY2FsbEFy Z0FyZWFTaXplKCkgeyByZXR1cm4gdGhpcy5fY2FsbEFyZ0FyZWFTaXplOyB9CiAgICAgCkBAIC0x MTYsMTIgKzExMSwxMiBAQCBjbGFzcyBDb2RlIHsKICAgICAgICAgaWYgKHRoaXMuc3RhY2tTbG90 cy5sZW5ndGgpIHsKICAgICAgICAgICAgIHJlc3VsdCArPSAiU3RhY2sgc2xvdHM6XG4iOwogICAg ICAgICAgICAgZm9yIChsZXQgc2xvdCBvZiB0aGlzLnN0YWNrU2xvdHMpCi0gICAgICAgICAgICAg ICAgcmVzdWx0ICs9ICIgICAgIiArIHNsb3QgKyAiXG4iOworICAgICAgICAgICAgICAgIHJlc3Vs dCArPSBgICAgICR7c2xvdH1cbmA7CiAgICAgICAgIH0KICAgICAgICAgaWYgKHRoaXMuX2ZyYW1l U2l6ZSkKLSAgICAgICAgICAgIHJlc3VsdCArPSAiRnJhbWUgc2l6ZTogIiArIHRoaXMuX2ZyYW1l U2l6ZSArICJcbiI7CisgICAgICAgICAgICByZXN1bHQgKz0gYEZyYW1lIHNpemU6ICR7dGhpcy5f ZnJhbWVTaXplfVxuYDsKICAgICAgICAgaWYgKHRoaXMuX2NhbGxBcmdBcmVhU2l6ZSkKLSAgICAg ICAgICAgIHJlc3VsdCArPSAiQ2FsbCBhcmcgYXJlYSBzaXplOiAiICsgdGhpcy5fY2FsbEFyZ0Fy ZWFTaXplICsgIlxuIjsKKyAgICAgICAgICAgIHJlc3VsdCArPSBgQ2FsbCBhcmcgYXJlYSBzaXpl OiAke3RoaXMuX2NhbGxBcmdBcmVhU2l6ZX1cbmA7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAg ICAgfQogfQpJbmRleDogUGVyZm9ybWFuY2VUZXN0cy9KU0Fpci9jdXN0b20uanMKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9KU0Fpci9jdXN0b20uanMJKHJldmlzaW9uIDIwMTgwNikK KysrIFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvY3VzdG9tLmpzCSh3b3JraW5nIGNvcHkpCkBAIC01 MCw5ICs1MCw4IEBAIGNvbnN0IFBhdGNoQ3VzdG9tID0gewogICAgIGZvckVhY2hBcmcoaW5zdCwg ZnVuYykKICAgICB7CiAgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgaW5zdC5hcmdzLmxlbmd0 aDsgKytpKSB7Ci0gICAgICAgICAgICBpbnN0LnZpc2l0QXJnKAotICAgICAgICAgICAgICAgIGks IGZ1bmMsIGluc3QucGF0Y2hBcmdEYXRhW2ldLnJvbGUsIGluc3QucGF0Y2hBcmdEYXRhW2ldLnR5 cGUsCi0gICAgICAgICAgICAgICAgaW5zdC5wYXRjaEFyZ0RhdGFbaV0ud2lkdGgpOworICAgICAg ICAgICAgbGV0IHt0eXBlLCByb2xlLCB3aWR0aH0gPSBpbnN0LnBhdGNoQXJnRGF0YVtpXTsKKyAg ICAgICAgICAgIGluc3QudmlzaXRBcmcoaSwgZnVuYywgcm9sZSwgdHlwZSwgd2lkdGgpOwogICAg ICAgICB9CiAgICAgfSwKICAgICAKSW5kZXg6IFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvaW5zdC5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBQZXJmb3JtYW5jZVRlc3RzL0pTQWlyL2luc3QuanMJKHJldmlzaW9u IDIwMTgwNykKKysrIFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvaW5zdC5qcwkod29ya2luZyBjb3B5 KQpAQCAtMjUsMTAgKzI1LDEwIEBACiAidXNlIHN0cmljdCI7CiAKIGNsYXNzIEluc3QgewotICAg IGNvbnN0cnVjdG9yKG9wY29kZSwgYXJncykKKyAgICBjb25zdHJ1Y3RvcihvcGNvZGUsIGFyZ3Mg PSBbXSkKICAgICB7CiAgICAgICAgIHRoaXMuX29wY29kZSA9IG9wY29kZTsKLSAgICAgICAgdGhp cy5fYXJncyA9IGFyZ3MgPT0gbnVsbCA/IFtdIDogYXJnczsKKyAgICAgICAgdGhpcy5fYXJncyA9 IGFyZ3M7CiAgICAgfQogICAgIAogICAgIGFwcGVuZCguLi5hcmdzKQpJbmRleDogUGVyZm9ybWFu Y2VUZXN0cy9KU0Fpci9yZWcuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gUGVyZm9ybWFuY2VUZXN0cy9KU0Fp ci9yZWcuanMJKHJldmlzaW9uIDIwMTgwNykKKysrIFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvcmVn LmpzCSh3b3JraW5nIGNvcHkpCkBAIC01NSw3ICs1NSw3IEBAIGNsYXNzIFJlZyBleHRlbmRzIFRt cEJhc2UgewogICAgIAogICAgIHRvU3RyaW5nKCkKICAgICB7Ci0gICAgICAgIHJldHVybiAiJSIg KyB0aGlzLl9uYW1lOworICAgICAgICByZXR1cm4gYCUke3RoaXMuX25hbWV9YDsKICAgICB9CiAg ICAgCiAgICAgc3RhdGljIGV4dHJhY3QoYXJnKQpAQCAtMTA5LDEyICsxMDksMTIgQEAgY2xhc3Mg UmVnIGV4dGVuZHMgVG1wQmFzZSB7CiAgICAgICAgIFJlZy5yc2kgPSBuZXdHUFIoInJzaSIpOwog ICAgICAgICBSZWcucmRpID0gbmV3R1BSKCJyZGkiKTsKICAgICAgICAgZm9yIChsZXQgaSA9IDg7 IGkgPD0gMTU7ICsraSkKLSAgICAgICAgICAgIFJlZ1siciIgKyBpXSA9IG5ld0dQUigiciIgKyBp LCBpID49IDEyKTsKKyAgICAgICAgICAgIFJlZ1tgciR7aX1gXSA9IG5ld0dQUihgciR7aX1gLCBp ID49IDEyKTsKICAgICB9CiAKICAgICAvLyBEZWZpbmUgWDg2XzY0IEZQUnMuCiAgICAgZm9yIChs ZXQgaSA9IDA7IGkgPD0gMTU7ICsraSkKLSAgICAgICAgUmVnWyJ4bW0iICsgaV0gPSBuZXdSZWco aSwgRlAsICJ4bW0iICsgaSk7CisgICAgICAgIFJlZ1tgeG1tJHtpfWBdID0gbmV3UmVnKGksIEZQ LCBgeG1tJHtpfWApOwogCiAgICAgUmVnLmdwcnMgPSBbXQogICAgIFJlZy5mcHJzID0gW10KSW5k ZXg6IFBlcmZvcm1hbmNlVGVzdHMvSlNBaXIvdXRpbC5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBQZXJmb3Jt YW5jZVRlc3RzL0pTQWlyL3V0aWwuanMJKHJldmlzaW9uIDIwMTgwNykKKysrIFBlcmZvcm1hbmNl VGVzdHMvSlNBaXIvdXRpbC5qcwkod29ya2luZyBjb3B5KQpAQCAtNDksNiArNDksMTEgQEAgZnVu Y3Rpb24gc3ltYm9sTmFtZShzeW1ib2wpCiAgICAgcmV0dXJuIGZ1bGxTdHJpbmcuc3Vic3RyaW5n KCJTeW1ib2woIi5sZW5ndGgsIGZ1bGxTdHJpbmcubGVuZ3RoIC0gIikiLmxlbmd0aCk7CiB9CiAK K2Z1bmN0aW9uIGxvd2VyU3ltYm9sTmFtZShzeW1ib2wpCit7CisgICAgcmV0dXJuIHN5bWJvbE5h bWUoc3ltYm9sKS50b0xvd2VyQ2FzZSgpOworfQorCiBmdW5jdGlvbiBzZXRUb1N0cmluZyhzZXQp CiB7CiAgICAgbGV0IHJlc3VsdCA9ICIiOwo=