155384 2016-03-11 15:14:07 -0800 assignments in for-in/for-of header not allowed 2016-03-14 11:38:55 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1173897 0 saam 2016-03-11 15:14:07 -0800 ... 1173922 1 273785 saam 2016-03-11 16:49:33 -0800 Created attachment 273785 patch 1174229 2 273785 darin 2016-03-13 14:41:39 -0700 Comment on attachment 273785 patch View in context: https://bugs.webkit.org/attachment.cgi?id=273785&action=review > Source/JavaScriptCore/parser/ASTBuilder.h:185 > + bool isNewTarget(ExpressionNode* expr) { return expr->isNewTarget(); } I suggest either the word "expression" or the word "node" rather than the abbreviation "expr". > Source/JavaScriptCore/parser/Nodes.h:562 > + bool isNewTarget() const override { return true; } We’ve been choosing to “final” rather than “override” in cases like this one in our virtual function style discussions for the WebKit project. Also, should just make it private since there’s no point calling it if you already have a reference or pointer to a NewTargetNode. 1174570 3 saam 2016-03-14 11:38:55 -0700 Thanks for the review. I made the suggestions you recommended. landed in: http://trac.webkit.org/changeset/198144 273785 2016-03-11 16:49:33 -0800 2016-03-13 14:41:39 -0700 patch b-backup.diff text/plain 13757 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4MDU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBA CisyMDE2LTAzLTExICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IGFzc2lnbm1lbnRzIGluIGZvci1pbi9mb3Itb2YgaGVhZGVyIG5vdCBhbGxvd2VkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTUzODQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHByZXZl bnRzIGFzc2lnbm1lbnRzIHRvIHRoZSBsb29wIHZhcmlhYmxlCisgICAgICAgIGluIGZvciBpbi9v ZiBsb29wcyBpbiBhbGwgYnV0IG9uZSBzaXR1YXRpb24uIFRoZSBmb2xsb3dpbmcKKyAgICAgICAg c3ludGF4IGlzIHN0aWxsIGFsbG93ZWQgZXZlbiB0aG91Z2ggdGhlIHNwZWMgcHJldmVudHMgaXQ6 CisgICAgICAgIGBgYAorICAgICAgICBmb3IgKHZhciBpID0gWCBpbiBibGFoKSA7CisgICAgICAg IGBgYAorICAgICAgICBJZiB0aGUgbG9vcCBjb250YWlucyBsZXQvY29uc3QsIGRlc3RydWN0dXJp bmcsIG9yIGlzIGEgZm9yLW9mCisgICAgICAgIGxvb3AsIHdlIGFsd2F5cyB0aHJvdyBhIHN5bnRh eCBlcnJvciBpZiB0aGVyZSBpcyBhbiBhc3NpZ25tZW50LgorICAgICAgICBXZSBjYW4gZG8gdGhp cyB3aXRoIGZ1bGwgYmFja3dhcmRzIGNvbXBhdGliaWxpdHkuCisgICAgICAgIFdlIG9ubHkgYWxs b3cgdGhlIGFib3ZlIHR5cGUgb2YgZm9yLWluIGxvb3BzIGJlY2F1c2UgT2xpdmVyIHRvbGQKKyAg ICAgICAgbWUgdGhhdCB3aGVuIGhlIHRyaWVkIHRvIG1ha2Ugc3VjaCBwcm9ncmFtcyBpbGxlZ2Fs IGhlIHJhbgorICAgICAgICBpbnRvIHJlYWwgd2Vic2l0ZXMgYnJlYWtpbmcuCisKKyAgICAgICAg VGhpcyBwYXRjaCBhbHNvIHJlbW92ZWQgdGhlICE6OkNyZWF0ZXNBU1QgY29tcGlsZS10aW1lIGJy YW5jaCB3aGVuIGNoZWNraW5nCisgICAgICAgIGFzc2lnbm1lbnRzIHRvIG5ldy50YXJnZXQuIFRo aXMgd2FzIGEgZGFuZ2Vyb3VzIHRoaW5nIGZvciBtZQorICAgICAgICB0byBpbnRyb2R1Y2UgaW50 byBvdXIgcGFyc2VyLiBUaGVyZSBhcmUgdGltZXMgd2hlcmUgOjpDcmVhdGVzQVNUCisgICAgICAg IGlzIHRydWUgYnV0IHdlIGFsc28gd2FudCB0byBjaGVjayBmb3Igc3ludGF4IGVycm9ycy4gRm9y IGV4YW1wbGUsCisgICAgICAgIHdoZW4gcGFyc2luZyB0aGUgdG9wLWxldmVsIEFTVCBvZiBhIHBy b2dyYW0uIFRob3VnaCB0aGlzIGNoZWNrCisgICAgICAgIHdhcyB0ZWNobmljYWxseSBjb3JyZWN0 LCBpdCdzIGRhbmdlcm91cyB0byBoYXZlLiBJdCB3YXMgY29ycmVjdAorICAgICAgICBiZWNhdXNl IHdlIHdvdWxkIGFsd2F5cyBiZSByZXBhcnNpbmcgdGhlIG5ldy50YXJnZXQgYXNzaWdubWVudAor ICAgICAgICBiZWNhdXNlIG5ldy50YXJnZXQgaXMgb25seSBhbGxvd2VkIGluc2lkZSBhIGZ1bmN0 aW9uLiBUaGF0IG1hZGUgaXQKKyAgICAgICAgc28gdGhhdCAoITo6Q3JlYXRlc0FTVCA8PT4gd2Ug Y2FyZSBhYm91dCBuZXcudGFyZ2V0IGFzc2lnbm1lbnQgc3ludGF4IGVycm9ycykuCisgICAgICAg IEJ1dCwgKCE6OkNyZWF0ZXNBU1QgPD0+IHdlIGNhcmUgYWJvdXQgc3ludGF4IGVycm9yIFgpIGlz IG5vdCB0cnVlIGluIGdlbmVyYWwuCisgICAgICAgIEkgdGhpbmsgaXQncyBzYWZlciB0byByZW1v dmUgc3VjaCBjb2RlLgorCisgICAgICAgICogcGFyc2VyL0FTVEJ1aWxkZXIuaDoKKyAgICAgICAg KEpTQzo6QVNUQnVpbGRlcjo6Y3JlYXRlTmV3VGFyZ2V0RXhwcik6CisgICAgICAgIChKU0M6OkFT VEJ1aWxkZXI6OmlzTmV3VGFyZ2V0KToKKyAgICAgICAgKEpTQzo6QVNUQnVpbGRlcjo6Y3JlYXRl UmVzb2x2ZSk6CisgICAgICAgICogcGFyc2VyL05vZGVzLmg6CisgICAgICAgIChKU0M6OkV4cHJl c3Npb25Ob2RlOjppc0Jvb2xlYW4pOgorICAgICAgICAoSlNDOjpFeHByZXNzaW9uTm9kZTo6aXNT cHJlYWRFeHByZXNzaW9uKToKKyAgICAgICAgKEpTQzo6RXhwcmVzc2lvbk5vZGU6OmlzU3VwZXJO b2RlKToKKyAgICAgICAgKEpTQzo6RXhwcmVzc2lvbk5vZGU6OmlzTmV3VGFyZ2V0KToKKyAgICAg ICAgKEpTQzo6RXhwcmVzc2lvbk5vZGU6OmlzQnl0ZWNvZGVJbnRyaW5zaWNOb2RlKToKKyAgICAg ICAgKiBwYXJzZXIvUGFyc2VyLmNwcDoKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46 OnBhcnNlRm9yU3RhdGVtZW50KToKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBh cnNlQXNzaWdubWVudEV4cHJlc3Npb24pOgorICAgICAgICAoSlNDOjpQYXJzZXI8TGV4ZXJUeXBl Pjo6cGFyc2VVbmFyeUV4cHJlc3Npb24pOgorCiAyMDE2LTAzLTExICBTYWFtIGJhcmF0aSAgPHNi YXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIFtFUzZdIE1ha2UgT2JqZWN0LmFzc2lnbiBzcGVj IGNvbXBsaWFudApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9BU1RCdWlsZGVy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9BU1RCdWlsZGVy LmgJKHJldmlzaW9uIDE5ODA0NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvQVNU QnVpbGRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODIsNyArMTgyLDcgQEAgcHVibGljOgogICAg ICAgICB1c2VzTmV3VGFyZ2V0KCk7CiAgICAgICAgIHJldHVybiBuZXcgKG1fcGFyc2VyQXJlbmEp IE5ld1RhcmdldE5vZGUobG9jYXRpb24pOwogICAgIH0KLSAgICBOT19SRVRVUk5fRFVFX1RPX0NS QVNIIGJvb2wgaXNOZXdUYXJnZXQoRXhwcmVzc2lvbk5vZGUqKSB7IFJFTEVBU0VfQVNTRVJUX05P VF9SRUFDSEVEKCk7IH0KKyAgICBib29sIGlzTmV3VGFyZ2V0KEV4cHJlc3Npb25Ob2RlKiBleHBy KSB7IHJldHVybiBleHByLT5pc05ld1RhcmdldCgpOyB9CiAgICAgRXhwcmVzc2lvbk5vZGUqIGNy ZWF0ZVJlc29sdmUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiBsb2NhdGlvbiwgY29uc3QgSWRlbnRp ZmllciYgaWRlbnQsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBzdGFydCwgY29uc3QgSlNUZXh0UG9z aXRpb24mIGVuZCkKICAgICB7CiAgICAgICAgIGlmIChtX3ZtLT5wcm9wZXJ0eU5hbWVzLT5hcmd1 bWVudHMgPT0gaWRlbnQpCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVz LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2Rlcy5oCShy ZXZpc2lvbiAxOTgwNDYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVzLmgJ KHdvcmtpbmcgY29weSkKQEAgLTE3NCw2ICsxNzQsNyBAQCBuYW1lc3BhY2UgSlNDIHsKICAgICAg ICAgdmlydHVhbCBib29sIGlzQm9vbGVhbigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CiAgICAg ICAgIHZpcnR1YWwgYm9vbCBpc1NwcmVhZEV4cHJlc3Npb24oKSBjb25zdCB7IHJldHVybiBmYWxz ZTsgfQogICAgICAgICB2aXJ0dWFsIGJvb2wgaXNTdXBlck5vZGUoKSBjb25zdCB7IHJldHVybiBm YWxzZTsgfQorICAgICAgICB2aXJ0dWFsIGJvb2wgaXNOZXdUYXJnZXQoKSBjb25zdCB7IHJldHVy biBmYWxzZTsgfQogICAgICAgICB2aXJ0dWFsIGJvb2wgaXNCeXRlY29kZUludHJpbnNpY05vZGUo KSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBlbWl0Qnl0 ZWNvZGVJbkNvbmRpdGlvbkNvbnRleHQoQnl0ZWNvZGVHZW5lcmF0b3ImLCBMYWJlbCosIExhYmVs KiwgRmFsbFRocm91Z2hNb2RlKTsKQEAgLTU1OCw2ICs1NTksNyBAQCBuYW1lc3BhY2UgSlNDIHsK ICAgICBjbGFzcyBOZXdUYXJnZXROb2RlIGZpbmFsIDogcHVibGljIEV4cHJlc3Npb25Ob2RlIHsK ICAgICBwdWJsaWM6CiAgICAgICAgIE5ld1RhcmdldE5vZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9u Jik7CisgICAgICAgIGJvb2wgaXNOZXdUYXJnZXQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0 cnVlOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBSZWdpc3RlcklEKiBlbWl0Qnl0ZWNvZGUo Qnl0ZWNvZGVHZW5lcmF0b3ImLCBSZWdpc3RlcklEKiA9IDApIG92ZXJyaWRlOwpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAkocmV2aXNpb24gMTk4MDQ2KQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0xMTU0LDEyICsxMTU0LDggQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3Rh dGVtZQogICAgICAgICAvLyBSZW1haW5kZXIgb2YgYSBzdGFuZGFyZCBmb3IgbG9vcCBpcyBoYW5k bGVkIGlkZW50aWNhbGx5CiAgICAgICAgIGlmIChtYXRjaChTRU1JQ09MT04pKQogICAgICAgICAg ICAgZ290byBzdGFuZGFyZEZvckxvb3A7Ci0gICAgICAgIAotICAgICAgICBmYWlsSWZGYWxzZShk ZWNsYXJhdGlvbnMgPT0gMSwgImNhbiBvbmx5IGRlY2xhcmUgYSBzaW5nbGUgdmFyaWFibGUgaW4g YW4gZW51bWVyYXRpb24iKTsKLSAgICAgICAgZmFpbElmVHJ1ZUlmU3RyaWN0KGZvckluSW5pdGlh bGl6ZXIsICJDYW5ub3QgdXNlIGluaXRpYWxpc2VyIHN5bnRheCBpbiBhIHN0cmljdCBtb2RlIGVu dW1lcmF0aW9uIik7CiAKLSAgICAgICAgaWYgKGZvckluSW5pdGlhbGl6ZXIpCi0gICAgICAgICAg ICBmYWlsSWZGYWxzZShjb250ZXh0LmlzQmluZGluZ05vZGUoZm9ySW5UYXJnZXQpLCAiQ2Fubm90 IHVzZSBpbml0aWFsaXNlciBzeW50YXggd2hlbiBiaW5kaW5nIHRvIGEgcGF0dGVybiBkdXJpbmcg ZW51bWVyYXRpb24iKTsKKyAgICAgICAgZmFpbElmRmFsc2UoZGVjbGFyYXRpb25zID09IDEsICJj YW4gb25seSBkZWNsYXJlIGEgc2luZ2xlIHZhcmlhYmxlIGluIGFuIGVudW1lcmF0aW9uIik7CiAK ICAgICAgICAgLy8gSGFuZGxlIGZvci1pbiB3aXRoIHZhciBkZWNsYXJhdGlvbgogICAgICAgICBK U1RleHRQb3NpdGlvbiBpbkxvY2F0aW9uID0gdG9rZW5TdGFydFBvc2l0aW9uKCk7CkBAIC0xMTY3 LDkgKzExNjMsMTUgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlU3RhdGVtZQog ICAgICAgICBpZiAoIWNvbnN1bWUoSU5UT0tFTikpIHsKICAgICAgICAgICAgIGZhaWxJZkZhbHNl KG1hdGNoKElERU5UKSAmJiAqbV90b2tlbi5tX2RhdGEuaWRlbnQgPT0gbV92bS0+cHJvcGVydHlO YW1lcy0+b2YsICJFeHBlY3RlZCBlaXRoZXIgJ2luJyBvciAnb2YnIGluIGVudW1lcmF0aW9uIHN5 bnRheCIpOwogICAgICAgICAgICAgaXNPZkVudW1lcmF0aW9uID0gdHJ1ZTsKLSAgICAgICAgICAg IGZhaWxJZlRydWUoZm9ySW5Jbml0aWFsaXplciwgIkNhbm5vdCB1c2UgaW5pdGlhbGlzZXIgc3lu dGF4IGluIGEgZm9yLW9mIGVudW1lcmF0aW9uIik7CiAgICAgICAgICAgICBuZXh0KCk7CiAgICAg ICAgIH0KKyAgICAgICAgYm9vbCBoYXNBbnlBc3NpZ25tZW50cyA9ICEhZm9ySW5Jbml0aWFsaXpl cjsKKyAgICAgICAgaWYgKGhhc0FueUFzc2lnbm1lbnRzKSB7CisgICAgICAgICAgICBpZiAoaXNP ZkVudW1lcmF0aW9uKQorICAgICAgICAgICAgICAgIGludGVybmFsRmFpbFdpdGhNZXNzYWdlKGZh bHNlLCAiQ2Fubm90IGFzc2lnbiB0byB0aGUgbG9vcCB2YXJpYWJsZSBpbnNpZGUgYSBmb3Itb2Yg bG9vcCBoZWFkZXIiKTsKKyAgICAgICAgICAgIGlmIChzdHJpY3RNb2RlKCkgfHwgKGlzTGV0RGVj bGFyYXRpb24gfHwgaXNDb25zdERlY2xhcmF0aW9uKSB8fCAhY29udGV4dC5pc0JpbmRpbmdOb2Rl KGZvckluVGFyZ2V0KSkKKyAgICAgICAgICAgICAgICBpbnRlcm5hbEZhaWxXaXRoTWVzc2FnZShm YWxzZSwgIkNhbm5vdCBhc3NpZ24gdG8gdGhlIGxvb3AgdmFyaWFibGUgaW5zaWRlIGEgZm9yLWlu IGxvb3AgaGVhZGVyIik7CisgICAgICAgIH0KICAgICAgICAgVHJlZUV4cHJlc3Npb24gZXhwciA9 IHBhcnNlRXhwcmVzc2lvbihjb250ZXh0KTsKICAgICAgICAgZmFpbElmRmFsc2UoZXhwciwgIkV4 cGVjdGVkIGV4cHJlc3Npb24gdG8gZW51bWVyYXRlIik7CiAgICAgICAgIEpTVGV4dFBvc2l0aW9u IGV4cHJFbmQgPSBsYXN0VG9rZW5FbmRQb3NpdGlvbigpOwpAQCAtMzA0NCwxMCArMzA0Niw4IEBA IHRlbXBsYXRlIDx0eXBlbmFtZSBUcmVlQnVpbGRlcj4gVHJlZUV4cHIKICAgICAgICAgfQogICAg ICAgICBtX3BhcnNlclN0YXRlLm5vblRyaXZpYWxFeHByZXNzaW9uQ291bnQrKzsKICAgICAgICAg aGFkQXNzaWdubWVudCA9IHRydWU7Ci0gICAgICAgIGlmICghVHJlZUJ1aWxkZXI6OkNyZWF0ZXNB U1QpIHsgLy8gV2Ugb25seSBuZWVkIHRvIGRvIHRoaXMgY2hlY2sgd2l0aCB0aGUgc3ludGF4IGNo ZWNrZXIuCi0gICAgICAgICAgICBpZiAoVU5MSUtFTFkoY29udGV4dC5pc05ld1RhcmdldChsaHMp KSkKLSAgICAgICAgICAgICAgICBpbnRlcm5hbEZhaWxXaXRoTWVzc2FnZShmYWxzZSwgIm5ldy50 YXJnZXQgY2FuJ3QgYmUgdGhlIGxlZnQgaGFuZCBzaWRlIG9mIGFuIGFzc2lnbm1lbnQgZXhwcmVz c2lvbiIpOwotICAgICAgICB9CisgICAgICAgIGlmIChVTkxJS0VMWShjb250ZXh0LmlzTmV3VGFy Z2V0KGxocykpKQorICAgICAgICAgICAgaW50ZXJuYWxGYWlsV2l0aE1lc3NhZ2UoZmFsc2UsICJu ZXcudGFyZ2V0IGNhbid0IGJlIHRoZSBsZWZ0IGhhbmQgc2lkZSBvZiBhbiBhc3NpZ25tZW50IGV4 cHJlc3Npb24iKTsKICAgICAgICAgY29udGV4dC5hc3NpZ25tZW50U3RhY2tBcHBlbmQoYXNzaWdu bWVudFN0YWNrLCBsaHMsIHN0YXJ0LCB0b2tlblN0YXJ0UG9zaXRpb24oKSwgbV9wYXJzZXJTdGF0 ZS5hc3NpZ25tZW50Q291bnQsIG9wKTsKICAgICAgICAgc3RhcnQgPSB0b2tlblN0YXJ0UG9zaXRp b24oKTsKICAgICAgICAgbV9wYXJzZXJTdGF0ZS5hc3NpZ25tZW50Q291bnQrKzsKQEAgLTQwMTMs MTAgKzQwMTMsOCBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzCiAg ICAgICAgICAgICBmYWlsV2l0aE1lc3NhZ2UoIkNhbm5vdCBwYXJzZSBzdWJleHByZXNzaW9uIG9m ICIsIG9wZXJhdG9yU3RyaW5nKHRydWUsIGxhc3RPcGVyYXRvciksICJvcGVyYXRvciIpOwogICAg ICAgICBmYWlsV2l0aE1lc3NhZ2UoIkNhbm5vdCBwYXJzZSBtZW1iZXIgZXhwcmVzc2lvbiIpOwog ICAgIH0KLSAgICBpZiAoIVRyZWVCdWlsZGVyOjpDcmVhdGVzQVNUKSB7IC8vIFdlIG9ubHkgbmVl ZCB0byBkbyB0aGlzIGNoZWNrIHdpdGggdGhlIHN5bnRheCBjaGVja2VyLgotICAgICAgICBpZiAo VU5MSUtFTFkobGFzdE9wZXJhdG9yICYmIGNvbnRleHQuaXNOZXdUYXJnZXQoZXhwcikpKQotICAg ICAgICAgICAgaW50ZXJuYWxGYWlsV2l0aE1lc3NhZ2UoZmFsc2UsICJuZXcudGFyZ2V0IGNhbid0 IGNvbWUgYWZ0ZXIgYSBwcmVmaXggb3BlcmF0b3IiKTsKLSAgICB9CisgICAgaWYgKFVOTElLRUxZ KGxhc3RPcGVyYXRvciAmJiBjb250ZXh0LmlzTmV3VGFyZ2V0KGV4cHIpKSkKKyAgICAgICAgaW50 ZXJuYWxGYWlsV2l0aE1lc3NhZ2UoZmFsc2UsICJuZXcudGFyZ2V0IGNhbid0IGNvbWUgYWZ0ZXIg YSBwcmVmaXggb3BlcmF0b3IiKTsKICAgICBib29sIGlzRXZhbE9yQXJndW1lbnRzID0gZmFsc2U7 CiAgICAgaWYgKHN0cmljdE1vZGUoKSAmJiAhbV9zeW50YXhBbHJlYWR5VmFsaWRhdGVkKSB7CiAg ICAgICAgIGlmIChjb250ZXh0LmlzUmVzb2x2ZShleHByKSkKQEAgLTQwMjUsMTAgKzQwMjMsOCBA QCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNzCiAgICAgZmFpbElmVHJ1 ZUlmU3RyaWN0KGlzRXZhbE9yQXJndW1lbnRzICYmIG1vZGlmaWVzRXhwciwgIkNhbm5vdCBtb2Rp ZnkgJyIsIG1fcGFyc2VyU3RhdGUubGFzdElkZW50aWZpZXItPmltcGwoKSwgIicgaW4gc3RyaWN0 IG1vZGUiKTsKICAgICBzd2l0Y2ggKG1fdG9rZW4ubV90eXBlKSB7CiAgICAgY2FzZSBQTFVTUExV UzoKLSAgICAgICAgaWYgKCFUcmVlQnVpbGRlcjo6Q3JlYXRlc0FTVCkgeyAvLyBXZSBvbmx5IG5l ZWQgdG8gZG8gdGhpcyBjaGVjayB3aXRoIHRoZSBzeW50YXggY2hlY2tlci4KLSAgICAgICAgICAg IGlmIChVTkxJS0VMWShjb250ZXh0LmlzTmV3VGFyZ2V0KGV4cHIpKSkKLSAgICAgICAgICAgICAg ICBpbnRlcm5hbEZhaWxXaXRoTWVzc2FnZShmYWxzZSwgIm5ldy50YXJnZXQgY2FuJ3QgY29tZSBi ZWZvcmUgYSBwb3N0Zml4IG9wZXJhdG9yIik7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKFVOTElL RUxZKGNvbnRleHQuaXNOZXdUYXJnZXQoZXhwcikpKQorICAgICAgICAgICAgaW50ZXJuYWxGYWls V2l0aE1lc3NhZ2UoZmFsc2UsICJuZXcudGFyZ2V0IGNhbid0IGNvbWUgYmVmb3JlIGEgcG9zdGZp eCBvcGVyYXRvciIpOwogICAgICAgICBtX3BhcnNlclN0YXRlLm5vblRyaXZpYWxFeHByZXNzaW9u Q291bnQrKzsKICAgICAgICAgbV9wYXJzZXJTdGF0ZS5ub25MSFNDb3VudCsrOwogICAgICAgICBl eHByID0gY29udGV4dC5tYWtlUG9zdGZpeE5vZGUobG9jYXRpb24sIGV4cHIsIE9wUGx1c1BsdXMs IHN1YkV4cHJTdGFydCwgbGFzdFRva2VuRW5kUG9zaXRpb24oKSwgdG9rZW5FbmRQb3NpdGlvbigp KTsKQEAgLTQwMzksMTAgKzQwMzUsOCBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRy ZWVFeHByZXNzCiAgICAgICAgIG5leHQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBNSU5V U01JTlVTOgotICAgICAgICBpZiAoIVRyZWVCdWlsZGVyOjpDcmVhdGVzQVNUKSB7IC8vIFdlIG9u bHkgbmVlZCB0byBkbyB0aGlzIGNoZWNrIHdpdGggdGhlIHN5bnRheCBjaGVja2VyLgotICAgICAg ICAgICAgaWYgKFVOTElLRUxZKGNvbnRleHQuaXNOZXdUYXJnZXQoZXhwcikpKQotICAgICAgICAg ICAgICAgIGludGVybmFsRmFpbFdpdGhNZXNzYWdlKGZhbHNlLCAibmV3LnRhcmdldCBjYW4ndCBj b21lIGJlZm9yZSBhIHBvc3RmaXggb3BlcmF0b3IiKTsKLSAgICAgICAgfQorICAgICAgICBpZiAo VU5MSUtFTFkoY29udGV4dC5pc05ld1RhcmdldChleHByKSkpCisgICAgICAgICAgICBpbnRlcm5h bEZhaWxXaXRoTWVzc2FnZShmYWxzZSwgIm5ldy50YXJnZXQgY2FuJ3QgY29tZSBiZWZvcmUgYSBw b3N0Zml4IG9wZXJhdG9yIik7CiAgICAgICAgIG1fcGFyc2VyU3RhdGUubm9uVHJpdmlhbEV4cHJl c3Npb25Db3VudCsrOwogICAgICAgICBtX3BhcnNlclN0YXRlLm5vbkxIU0NvdW50Kys7CiAgICAg ICAgIGV4cHIgPSBjb250ZXh0Lm1ha2VQb3N0Zml4Tm9kZShsb2NhdGlvbiwgZXhwciwgT3BNaW51 c01pbnVzLCBzdWJFeHByU3RhcnQsIGxhc3RUb2tlbkVuZFBvc2l0aW9uKCksIHRva2VuRW5kUG9z aXRpb24oKSk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTgwNDYpCisrKyBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxNi0wMy0xMSAgU2FhbSBi YXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICBhc3NpZ25tZW50cyBpbiBmb3It aW4vZm9yLW9mIGhlYWRlciBub3QgYWxsb3dlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1Mzg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBqcy9wYXJzZXItc3ludGF4LWNoZWNrLWV4cGVjdGVkLnR4 dDoKKyAgICAgICAgKiBqcy9zY3JpcHQtdGVzdHMvcGFyc2VyLXN5bnRheC1jaGVjay5qczoKKwog MjAxNi0wMy0xMSAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAg ICBNYXJraW5nIG1lZGlhL3RyYWNrL3RyYWNrLWluLWJhbmQtc3R5bGUuaHRtbCBhcyBmbGFreSBv biBZb3NlbWl0ZQpJbmRleDogTGF5b3V0VGVzdHMvanMvcGFyc2VyLXN5bnRheC1jaGVjay1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvanMvcGFyc2VyLXN5bnRheC1jaGVj ay1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE5ODA0NikKKysrIExheW91dFRlc3RzL2pzL3BhcnNl ci1zeW50YXgtY2hlY2stZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC01MjYsNiArNTI2 LDM2IEBAIFBBU1MgSW52YWxpZDogImZvciAodmFyIChhKSBpbiBiKSB7IH0iCiBQQVNTIEludmFs aWQ6ICJmdW5jdGlvbiBmKCkgeyBmb3IgKHZhciAoYSkgaW4gYikgeyB9IH0iCiBQQVNTIFZhbGlk OiAgICJmb3IgKHZhciBhID0gNywgYiA9IGMgPCBkID49IGQgOyBmKClbNl0rKyA7IC0taSgpWzFd KysgKSB7fSIgd2l0aCBSZWZlcmVuY2VFcnJvcgogUEFTUyBWYWxpZDogICAiZnVuY3Rpb24gZigp IHsgZm9yICh2YXIgYSA9IDcsIGIgPSBjIDwgZCA+PSBkIDsgZigpWzZdKysgOyAtLWkoKVsxXSsr ICkge30gfSIKK1BBU1MgSW52YWxpZDogImZvciAodmFyIHthfSA9IDIwIGluIGIpIHsgfSIKK1BB U1MgSW52YWxpZDogImZ1bmN0aW9uIGYoKSB7IGZvciAodmFyIHthfSA9IDIwIGluIGIpIHsgfSB9 IgorUEFTUyBJbnZhbGlkOiAiZm9yICh2YXIge2F9ID0gMjAgb2YgYikgeyB9IgorUEFTUyBJbnZh bGlkOiAiZnVuY3Rpb24gZigpIHsgZm9yICh2YXIge2F9ID0gMjAgb2YgYikgeyB9IH0iCitQQVNT IEludmFsaWQ6ICJmb3IgKHZhciB7YX0gPSAyMCBpbiBiKSB7IH0iCitQQVNTIEludmFsaWQ6ICJm dW5jdGlvbiBmKCkgeyBmb3IgKHZhciB7YX0gPSAyMCBpbiBiKSB7IH0gfSIKK1BBU1MgVmFsaWQ6 ICAgImZvciAodmFyIGkgPSAyMCBpbiBiKSB7IH0iIHdpdGggUmVmZXJlbmNlRXJyb3IKK1BBU1Mg VmFsaWQ6ICAgImZ1bmN0aW9uIGYoKSB7IGZvciAodmFyIGkgPSAyMCBpbiBiKSB7IH0gfSIKK1BB U1MgSW52YWxpZDogImZvciAodmFyIGkgPSAyMCBvZiBiKSB7IH0iCitQQVNTIEludmFsaWQ6ICJm dW5jdGlvbiBmKCkgeyBmb3IgKHZhciBpID0gMjAgb2YgYikgeyB9IH0iCitQQVNTIEludmFsaWQ6 ICJmb3IgKHZhciB7aX0gPSAyMCBvZiBiKSB7IH0iCitQQVNTIEludmFsaWQ6ICJmdW5jdGlvbiBm KCkgeyBmb3IgKHZhciB7aX0gPSAyMCBvZiBiKSB7IH0gfSIKK1BBU1MgSW52YWxpZDogImZvciAo dmFyIFtpXSA9IDIwIG9mIGIpIHsgfSIKK1BBU1MgSW52YWxpZDogImZ1bmN0aW9uIGYoKSB7IGZv ciAodmFyIFtpXSA9IDIwIG9mIGIpIHsgfSB9IgorUEFTUyBJbnZhbGlkOiAiZm9yIChsZXQgW2ld ID0gMjAgb2YgYikgeyB9IgorUEFTUyBJbnZhbGlkOiAiZnVuY3Rpb24gZigpIHsgZm9yIChsZXQg W2ldID0gMjAgb2YgYikgeyB9IH0iCitQQVNTIEludmFsaWQ6ICJmb3IgKGNvbnN0IFtpXSA9IDIw IG9mIGIpIHsgfSIKK1BBU1MgSW52YWxpZDogImZ1bmN0aW9uIGYoKSB7IGZvciAoY29uc3QgW2ld ID0gMjAgb2YgYikgeyB9IH0iCitQQVNTIEludmFsaWQ6ICJmb3IgKGNvbnN0IGkgPSAyMCBvZiBi KSB7IH0iCitQQVNTIEludmFsaWQ6ICJmdW5jdGlvbiBmKCkgeyBmb3IgKGNvbnN0IGkgPSAyMCBv ZiBiKSB7IH0gfSIKK1BBU1MgSW52YWxpZDogImZvciAobGV0IGkgPSAyMCBvZiBiKSB7IH0iCitQ QVNTIEludmFsaWQ6ICJmdW5jdGlvbiBmKCkgeyBmb3IgKGxldCBpID0gMjAgb2YgYikgeyB9IH0i CitQQVNTIEludmFsaWQ6ICJmb3IgKGxldCBpID0gMjAgaW4gYikgeyB9IgorUEFTUyBJbnZhbGlk OiAiZnVuY3Rpb24gZigpIHsgZm9yIChsZXQgaSA9IDIwIGluIGIpIHsgfSB9IgorUEFTUyBJbnZh bGlkOiAiZm9yIChjb25zdCBpID0gMjAgaW4gYikgeyB9IgorUEFTUyBJbnZhbGlkOiAiZnVuY3Rp b24gZigpIHsgZm9yIChjb25zdCBpID0gMjAgaW4gYikgeyB9IH0iCitQQVNTIEludmFsaWQ6ICJm b3IgKGNvbnN0IHtpfSA9IDIwIGluIGIpIHsgfSIKK1BBU1MgSW52YWxpZDogImZ1bmN0aW9uIGYo KSB7IGZvciAoY29uc3Qge2l9ID0gMjAgaW4gYikgeyB9IH0iCitQQVNTIEludmFsaWQ6ICJmb3Ig KGxldCB7aX0gPSAyMCBpbiBiKSB7IH0iCitQQVNTIEludmFsaWQ6ICJmdW5jdGlvbiBmKCkgeyBm b3IgKGxldCB7aX0gPSAyMCBpbiBiKSB7IH0gfSIKIHRyeSBzdGF0ZW1lbnQKIFBBU1MgSW52YWxp ZDogInRyeSB7IGJyZWFrIH0gY2F0Y2goZSkge30iCiBQQVNTIEludmFsaWQ6ICJmdW5jdGlvbiBm KCkgeyB0cnkgeyBicmVhayB9IGNhdGNoKGUpIHt9IH0iCkluZGV4OiBMYXlvdXRUZXN0cy9qcy9z Y3JpcHQtdGVzdHMvcGFyc2VyLXN5bnRheC1jaGVjay5qcwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9qcy9zY3JpcHQtdGVzdHMvcGFyc2VyLXN5bnRheC1jaGVjay5qcwkocmV2aXNpb24gMTk4 MDQ2KQorKysgTGF5b3V0VGVzdHMvanMvc2NyaXB0LXRlc3RzL3BhcnNlci1zeW50YXgtY2hlY2su anMJKHdvcmtpbmcgY29weSkKQEAgLTM0NCw2ICszNDQsMjEgQEAgdmFsaWQoImZvciAodmFyIGEg PSAoYiBpbiBjKSBpbiBkKSBicmVhawogaW52YWxpZCgiZm9yICh2YXIgYSA9IChiIGluIGMgaW4g ZCkgYnJlYWsiKTsKIGludmFsaWQoImZvciAodmFyIChhKSBpbiBiKSB7IH0iKTsKIHZhbGlkICAo ImZvciAodmFyIGEgPSA3LCBiID0gYyA8IGQgPj0gZCA7IGYoKVs2XSsrIDsgLS1pKClbMV0rKyAp IHt9Iik7CitpbnZhbGlkKCJmb3IgKHZhciB7YX0gPSAyMCBpbiBiKSB7IH0iKTsKK2ludmFsaWQo ImZvciAodmFyIHthfSA9IDIwIG9mIGIpIHsgfSIpOworaW52YWxpZCgiZm9yICh2YXIge2F9ID0g MjAgaW4gYikgeyB9Iik7Cit2YWxpZCgiZm9yICh2YXIgaSA9IDIwIGluIGIpIHsgfSIpOworaW52 YWxpZCgiZm9yICh2YXIgaSA9IDIwIG9mIGIpIHsgfSIpOworaW52YWxpZCgiZm9yICh2YXIge2l9 ID0gMjAgb2YgYikgeyB9Iik7CitpbnZhbGlkKCJmb3IgKHZhciBbaV0gPSAyMCBvZiBiKSB7IH0i KTsKK2ludmFsaWQoImZvciAobGV0IFtpXSA9IDIwIG9mIGIpIHsgfSIpOworaW52YWxpZCgiZm9y IChjb25zdCBbaV0gPSAyMCBvZiBiKSB7IH0iKTsKK2ludmFsaWQoImZvciAoY29uc3QgaSA9IDIw IG9mIGIpIHsgfSIpOworaW52YWxpZCgiZm9yIChsZXQgaSA9IDIwIG9mIGIpIHsgfSIpOworaW52 YWxpZCgiZm9yIChsZXQgaSA9IDIwIGluIGIpIHsgfSIpOworaW52YWxpZCgiZm9yIChjb25zdCBp ID0gMjAgaW4gYikgeyB9Iik7CitpbnZhbGlkKCJmb3IgKGNvbnN0IHtpfSA9IDIwIGluIGIpIHsg fSIpOworaW52YWxpZCgiZm9yIChsZXQge2l9ID0gMjAgaW4gYikgeyB9Iik7CiAKIGRlYnVnICAo InRyeSBzdGF0ZW1lbnQiKTsKIAo=