152575 2015-12-28 10:15:06 -0800 [ES6] Arrow function syntax. Lexical bind "super" inside of the arrow function in generator. 2016-03-04 11:19:07 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 145132 140855 1 gskachkov webkit-unassigned commit-queue keith_miller mark.lam msaboff saam ysuzuki oldest_to_newest 1151479 0 gskachkov 2015-12-28 10:15:06 -0800 We need support following case in lexical bind arguments in arrow function: class B { gen() { return 42; } } class A extends B { *gen() { let arr = () => super.gen(); return arr(); } } typeof a.gen().next() === 'array'; 1170132 1 gskachkov 2016-03-02 23:50:42 -0800 We are already supporting arguments in arrow function in generators. Modified test example: var result = 'some-value'; class B { gen() { return result; } } class A extends B { *gen() { let arr = () => super.gen(); return arr(); } } var a = new A(); a.gen().next().value === result; //Should be true now it is : SyntaxErorr: super can only be used in a method of a derived class 1170134 2 272737 gskachkov 2016-03-02 23:59:01 -0800 Created attachment 272737 Patch Patch comming 1170184 3 272737 ysuzuki 2016-03-03 04:54:37 -0800 Comment on attachment 272737 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272737&action=review Nice catch. The approach looks nice. A few nits. > Source/JavaScriptCore/parser/Parser.h:939 > { This function should be renamed to represent the returned scope is not generator's scope. And please note that this function skips arrow function and generator, but it does not skip generator function. > Source/JavaScriptCore/tests/stress/arrowfunction-lexical-bind-superproperty.js:147 > + } Could you add tests like method() { function *gen() { let arr = () => super.getValue(); arr(); } } This should be SyntaxError. 1170951 4 gskachkov 2016-03-04 11:18:48 -0800 Committed r197554: <http://trac.webkit.org/changeset/197554> 1170952 5 gskachkov 2016-03-04 11:19:07 -0800 All reviewed patches have been landed. Closing bug. 272737 2016-03-02 23:59:01 -0800 2016-03-03 04:54:37 -0800 Patch bug-152575-20160303095845.patch text/plain 8089 gskachkov U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3NDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw NmY1NTMxMTZjMzVkNzAzYTNiMzA1ZDIwZjMzYjQzYjY4MGY0NjcwLi4yNDM1YWNjYzJiYzIwOTQ4 NzRhMmE0NjJlMDA3ODkzNmQzY2Y4Y2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxNi0wMy0wMiAgU2thY2hrb3YgT2xla3NhbmRyICA8Z3NrYWNoa292QGdt YWlsLmNvbT4KKworICAgICAgICBbRVM2XSBBcnJvdyBmdW5jdGlvbiBzeW50YXguIExleGljYWwg YmluZCAic3VwZXIiIGluc2lkZSBvZiB0aGUgYXJyb3cgZnVuY3Rpb24gaW4gZ2VuZXJhdG9yLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUyNTc1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgc3Vw cG9ydCBvZiB0aGUgJ1N1cGVyUHJvcGVydHknIGluIGFycm93IGZ1bmN0aW9uIHdpdGhpbiBvZiB0 aGUgZ2VuZXJhdG9yIAorICAgICAgICBtZXRob2Qgb2YgY2xhc3MuIEJlZm9yZSBwYXRjaCBwYXJz ZXIgIGRpZCBub3QgcmVjb2duaXplIHRoYXQgY3VycmVudCBhcnJvdyBmdW5jdGlvbiAKKyAgICAg ICAgaXMgZGVjbGF0ZWQgaW5zaWRlIG9mIHRoZSBnZW5lcmF0b3IgYW5kIHJhaXNlIFN5bnRheEVy cm9yLgorCisgICAgICAgICogcGFyc2VyL1BhcnNlci5oOgorICAgICAgICAoSlNDOjpTY29wZTo6 U2NvcGUpOgorICAgICAgICAoSlNDOjpTY29wZTo6aXNHZW5lcmF0b3JCb3VuZGFyeSk6CisgICAg ICAgIChKU0M6OlNjb3BlOjpzZXRJc0Z1bmN0aW9uKToKKyAgICAgICAgKEpTQzo6U2NvcGU6OnNl dElzR2VuZXJhdG9yKToKKyAgICAgICAgKEpTQzo6UGFyc2VyOjpjbG9zZXN0UGFyZW50Tm9uQXJy b3dGdW5jdGlvbk5vbkxleGljYWxTY29wZSk6CisgICAgICAgICogdGVzdHMvc3RyZXNzL2Fycm93 ZnVuY3Rpb24tbGV4aWNhbC1iaW5kLXN1cGVycHJvcGVydHkuanM6CisKIDIwMTYtMDMtMDEgIFNr YWNoa292IE9sZWtzYW5kciAgPGdza2FjaGtvdkBnbWFpbC5jb20+CiAKICAgICAgICAgW0VTNl0g QXJyb3cgZnVuY3Rpb24uIFNvbWUgbm90IHVzZWQgYnl0ZSBjb2RlIGlzIGVtaXRlZApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuaCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKaW5kZXggM2E2MzZjODljMDBhZDJjNjc4OTIzMzZh MWY1Y2MyMDBhNjdmZTAxNy4uODU3OTAzZDA3ZWM5NDJlMjg4ZThiZDE1YjQzZjJlNDRiOGQwN2Vh OCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuaAorKysg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5oCkBAIC0xNzAsNiArMTcwLDcg QEAgc3RydWN0IFNjb3BlIHsKICAgICAgICAgLCBtX3N0cmljdE1vZGUoc3RyaWN0TW9kZSkKICAg ICAgICAgLCBtX2lzRnVuY3Rpb24oaXNGdW5jdGlvbikKICAgICAgICAgLCBtX2lzR2VuZXJhdG9y KGlzR2VuZXJhdG9yKQorICAgICAgICAsIG1faXNHZW5lcmF0b3JCb3VuZGFyeShmYWxzZSkKICAg ICAgICAgLCBtX2lzQXJyb3dGdW5jdGlvbihpc0Fycm93RnVuY3Rpb24pCiAgICAgICAgICwgbV9p c0Fycm93RnVuY3Rpb25Cb3VuZGFyeShmYWxzZSkKICAgICAgICAgLCBtX2lzTGV4aWNhbFNjb3Bl KGZhbHNlKQpAQCAtMTk2LDYgKzE5Nyw3IEBAIHN0cnVjdCBTY29wZSB7CiAgICAgICAgICwgbV9z dHJpY3RNb2RlKHJocy5tX3N0cmljdE1vZGUpCiAgICAgICAgICwgbV9pc0Z1bmN0aW9uKHJocy5t X2lzRnVuY3Rpb24pCiAgICAgICAgICwgbV9pc0dlbmVyYXRvcihyaHMubV9pc0dlbmVyYXRvcikK KyAgICAgICAgLCBtX2lzR2VuZXJhdG9yQm91bmRhcnkocmhzLm1faXNHZW5lcmF0b3JCb3VuZGFy eSkKICAgICAgICAgLCBtX2lzQXJyb3dGdW5jdGlvbihyaHMubV9pc0Fycm93RnVuY3Rpb24pCiAg ICAgICAgICwgbV9pc0Fycm93RnVuY3Rpb25Cb3VuZGFyeShyaHMubV9pc0Fycm93RnVuY3Rpb25C b3VuZGFyeSkKICAgICAgICAgLCBtX2lzTGV4aWNhbFNjb3BlKHJocy5tX2lzTGV4aWNhbFNjb3Bl KQpAQCAtMjg3LDYgKzI4OSw3IEBAIHN0cnVjdCBTY29wZSB7CiAgICAgYm9vbCBpc0Z1bmN0aW9u KCkgY29uc3QgeyByZXR1cm4gbV9pc0Z1bmN0aW9uOyB9CiAgICAgYm9vbCBpc0Z1bmN0aW9uQm91 bmRhcnkoKSBjb25zdCB7IHJldHVybiBtX2lzRnVuY3Rpb25Cb3VuZGFyeTsgfQogICAgIGJvb2wg aXNHZW5lcmF0b3IoKSBjb25zdCB7IHJldHVybiBtX2lzR2VuZXJhdG9yOyB9CisgICAgYm9vbCBp c0dlbmVyYXRvckJvdW5kYXJ5KCkgY29uc3QgeyByZXR1cm4gbV9pc0dlbmVyYXRvckJvdW5kYXJ5 OyB9CiAKICAgICBib29sIGhhc0FyZ3VtZW50cygpIGNvbnN0IHsgcmV0dXJuIG1faGFzQXJndW1l bnRzOyB9CiAKQEAgLTYyNCw2ICs2MjcsNyBAQCBwcml2YXRlOgogICAgICAgICBtX2hhc0FyZ3Vt ZW50cyA9IHRydWU7CiAgICAgICAgIHNldElzTGV4aWNhbFNjb3BlKCk7CiAgICAgICAgIG1faXNH ZW5lcmF0b3IgPSBmYWxzZTsKKyAgICAgICAgbV9pc0dlbmVyYXRvckJvdW5kYXJ5ID0gZmFsc2U7 CiAgICAgICAgIG1faXNBcnJvd0Z1bmN0aW9uQm91bmRhcnkgPSBmYWxzZTsKICAgICAgICAgbV9p c0Fycm93RnVuY3Rpb24gPSBmYWxzZTsKICAgICB9CkBAIC02MzgsNiArNjQyLDcgQEAgcHJpdmF0 ZToKICAgICB7CiAgICAgICAgIHNldElzRnVuY3Rpb24oKTsKICAgICAgICAgbV9pc0dlbmVyYXRv ciA9IHRydWU7CisgICAgICAgIG1faXNHZW5lcmF0b3JCb3VuZGFyeSA9IHRydWU7CiAgICAgICAg IG1faGFzQXJndW1lbnRzID0gZmFsc2U7CiAgICAgfQogICAgIApAQCAtNjY0LDYgKzY2OSw3IEBA IHByaXZhdGU6CiAgICAgYm9vbCBtX3N0cmljdE1vZGUgOiAxOwogICAgIGJvb2wgbV9pc0Z1bmN0 aW9uIDogMTsKICAgICBib29sIG1faXNHZW5lcmF0b3IgOiAxOworICAgIGJvb2wgbV9pc0dlbmVy YXRvckJvdW5kYXJ5IDogMTsKICAgICBib29sIG1faXNBcnJvd0Z1bmN0aW9uIDogMTsKICAgICBi b29sIG1faXNBcnJvd0Z1bmN0aW9uQm91bmRhcnkgOiAxOwogICAgIGJvb2wgbV9pc0xleGljYWxT Y29wZSA6IDE7CkBAIC05MzMsNyArOTM5LDcgQEAgcHJpdmF0ZToKICAgICB7CiAgICAgICAgIHVu c2lnbmVkIGkgPSBtX3Njb3BlU3RhY2suc2l6ZSgpIC0gMTsKICAgICAgICAgQVNTRVJUKGkgPCBt X3Njb3BlU3RhY2suc2l6ZSgpICYmIG1fc2NvcGVTdGFjay5zaXplKCkpOwotICAgICAgICB3aGls ZSAoaSAmJiAoIW1fc2NvcGVTdGFja1tpXS5pc0Z1bmN0aW9uQm91bmRhcnkoKSB8fCBtX3Njb3Bl U3RhY2tbaV0uaXNBcnJvd0Z1bmN0aW9uQm91bmRhcnkoKSkpCisgICAgICAgIHdoaWxlIChpICYm ICghbV9zY29wZVN0YWNrW2ldLmlzRnVuY3Rpb25Cb3VuZGFyeSgpIHx8IG1fc2NvcGVTdGFja1tp XS5pc0dlbmVyYXRvckJvdW5kYXJ5KCkgfHwgbV9zY29wZVN0YWNrW2ldLmlzQXJyb3dGdW5jdGlv bkJvdW5kYXJ5KCkpKQogICAgICAgICAgICAgaS0tOwogICAgICAgICByZXR1cm4gU2NvcGVSZWYo Jm1fc2NvcGVTdGFjaywgaSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3Rlc3RzL3N0cmVzcy9hcnJvd2Z1bmN0aW9uLWxleGljYWwtYmluZC1zdXBlcnByb3BlcnR5 LmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9hcnJvd2Z1bmN0aW9uLWxl eGljYWwtYmluZC1zdXBlcnByb3BlcnR5LmpzCmluZGV4IDJhMWYyYjQ2ODhkYmQ5MGFmNWU2YjZh OWNlZjg3NWIzYTI0OTljOWMuLmU5ZjU2MjMyMTQ2NTk3ZmVmN2YxZDBhY2ZjNmUzNTJiNjFmMDhl YjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvYXJyb3dm dW5jdGlvbi1sZXhpY2FsLWJpbmQtc3VwZXJwcm9wZXJ0eS5qcworKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvdGVzdHMvc3RyZXNzL2Fycm93ZnVuY3Rpb24tbGV4aWNhbC1iaW5kLXN1cGVycHJv cGVydHkuanMKQEAgLTEzNyw2ICsxMzcsMTQgQEAgdmFyIEcgPSBjbGFzcyBHIGV4dGVuZHMgQSB7 CiAgICAgICAgICAgICAgfQogICAgICAgICAgfQogICAgICB9CisgICAgICpnZW5HZXRQYXJlbnRW YWx1ZSgpIHsKKyAgICAgICAgIGxldCBhcnIgPSAoKSA9PiBzdXBlci5nZXRWYWx1ZSgpOworICAg ICAgICAgeWllbGQgYXJyKCk7CisgICAgIH0KKyAgICAgKmdlbkdldFBhcmVudFZhbHVlRGVlcEFy cm93KCkgeworICAgICAgICAgbGV0IGFyciA9ICgpID0+ICgpID0+ICgpID0+IHN1cGVyLmdldFZh bHVlKCk7CisgICAgICAgICB5aWVsZCBhcnIoKSgpKCk7CisgICAgIH0KICB9OwogCiAgdmFyIGcg PSBuZXcgRygpOwpAQCAtMTU3LDYgKzE2NSw4IEBAIGZvciAodmFyIGkgPSAwOyBpIDwgMTAwMDA7 IGkrKykgewogICAgIHRlc3RDYXNlKGdldFZhbHVlKCksICduZXctdmFsdWUnLCAnRXJyb3I6IFNv bWUgcHJvYmxlbSB3aXRoIHVzaW5nIGFycm93IGFuZCAic3VwZXIiIGluc2lkZSBvZiB0aGUgbWV0 aG9kIHRoYXQgcmV0dW4gYXJyb3cgZnVuY3Rpb24nKTsKICAgICBnZXRWYWx1ZSA9IGcxLmdldFZh bHVlQmxvY2tTY29wZSgpOwogICAgIHRlc3RDYXNlKGdldFZhbHVlKCksICduZXctdmFsdWUnLCAg J0Vycm9yOiBTb21lIHByb2JsZW0gd2l0aCB1c2luZyBhcnJvdyBhbmQgInN1cGVyIiB3aXRoIGRl ZXAgbmVzdGluZyBpbnNpZGUgb2YgdGhlIG1ldGhvZCB0aGF0IHJldHVuIGFycm93IGZ1bmN0aW9u Jyk7CisgICAgdGVzdENhc2UoZzEuZ2VuR2V0UGFyZW50VmFsdWUoKS5uZXh0KCkudmFsdWUsICdu ZXctdmFsdWUnLCAgJ0Vycm9yOiBTb21lIHByb2JsZW0gd2l0aCB1c2luZyBhcnJvdyBhbmQgInN1 cGVyIiB3aXRoIGRlZXAgbmVzdGluZyBpbnNpZGUgb2YgdGhlIGdlbmVyYXRvciBtZXRob2QgdGhh dCByZXR1biBhcnJvdyBmdW5jdGlvbicpOworICAgIHRlc3RDYXNlKGcxLmdlbkdldFBhcmVudFZh bHVlRGVlcEFycm93KCkubmV4dCgpLnZhbHVlLCAnbmV3LXZhbHVlJywgICdFcnJvcjogU29tZSBw cm9ibGVtIHdpdGggdXNpbmcgYXJyb3cgYW5kICJzdXBlciIgd2l0aCBkZWVwIG5lc3RpbmcgaW5z aWRlIG9mIHRoZSBnZW5lcmF0b3IgbWV0aG9kIHRoYXQgcmV0dW4gYXJyb3cgZnVuY3Rpb24nKTsK IH0KIAogdmFyIEggPSBjbGFzcyBIIGV4dGVuZHMgQSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMTk0ODllMWI2ZWUyMjIy Yjg5ZDI3OGVlYjg0YzZiZjRkMjBkZDVjOC4uOWQ5YzQzZDYyNTI5Nzg5MWViMGVjZjJmYTAxMDY2 N2I1NTVmOTVlMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE2LTAzLTAyICBTa2FjaGtvdiBP bGVrc2FuZHIgIDxnc2thY2hrb3ZAZ21haWwuY29tPgorCisgICAgICAgIFtFUzZdIEFycm93IGZ1 bmN0aW9uIHN5bnRheC4gTGV4aWNhbCBiaW5kICJzdXBlciIgaW5zaWRlIG9mIHRoZSBhcnJvdyBm dW5jdGlvbiBpbiBnZW5lcmF0b3IuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTI1NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGpzL2Fycm93ZnVuY3Rpb24tc3VwZXJwcm9wZXJ0eS1leHBlY3RlZC50 eHQ6CisgICAgICAgICoganMvc2NyaXB0LXRlc3RzL2Fycm93ZnVuY3Rpb24tc3VwZXJwcm9wZXJ0 eS5qczoKKyAgICAgICAgKEYucHJvdG90eXBlLmdlbkdldFBhcmVudFZhbHVlKToKKyAgICAgICAg KEYucHJvdG90eXBlLmdlbkdldFBhcmVudFZhbHVlRGVlcEFycm93KToKKyAgICAgICAgKEYpOgor CiAyMDE2LTAyLTI5ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAg ICAgIE1hcmtpbmcgd2ViZ2wvMS4wLjIvY29uZm9ybWFuY2UvZXh0ZW5zaW9ucy9nZXQtZXh0ZW5z aW9uLmh0bWwgYXMgZmxha3kgb24gbWFjLCByZW1vdmluZyB3azEgc3BlY2lmaWMgZmxha2luZXNz IGV4cGVjdGF0aW9uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvanMvYXJyb3dmdW5jdGlvbi1z dXBlcnByb3BlcnR5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2pzL2Fycm93ZnVuY3Rpb24t c3VwZXJwcm9wZXJ0eS1leHBlY3RlZC50eHQKaW5kZXggNDc2ZjlkNGQxZWU4Nzk3NmJjYjc0Mzlj ZGIwZjYxNWI2N2JiNjY3Yi4uNWY3MjZjYjBhMWJhNzBiMDg0YjJlOTU5ZTRlNGQ0YTQyNzBiMDQy MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvanMvYXJyb3dmdW5jdGlvbi1zdXBlcnByb3BlcnR5 LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9qcy9hcnJvd2Z1bmN0aW9uLXN1cGVycHJv cGVydHktZXhwZWN0ZWQudHh0CkBAIC05LDYgKzksOCBAQCBQQVNTIEUuZ2V0UGFyZW50U3RhdGlj VmFsdWUoKSBpcyBleHBlY3RlZFZhbHVlCiBQQVNTIGYucHJvcCBpcyBleHBlY3RlZFZhbHVlICsg Ii0iICsgZXhwZWN0ZWRWYWx1ZQogUEFTUyBmLnByb3AgaXMgZXhwZWN0ZWRWYWx1ZSArICItIiAr ICJuZXctdmFsdWUiCiBQQVNTIChuZXcgRigpKS5nZXRQYXJlbnRWYWx1ZSgpIGlzIGV4cGVjdGVk VmFsdWUKK1BBU1MgKG5ldyBGKCkpLmdlbkdldFBhcmVudFZhbHVlKCkubmV4dCgpLnZhbHVlIGlz IGV4cGVjdGVkVmFsdWUKK1BBU1MgKG5ldyBGKCkpLmdlbkdldFBhcmVudFZhbHVlRGVlcEFycm93 KCkubmV4dCgpLnZhbHVlIGlzIGV4cGVjdGVkVmFsdWUKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk IGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvanMvc2Ny aXB0LXRlc3RzL2Fycm93ZnVuY3Rpb24tc3VwZXJwcm9wZXJ0eS5qcyBiL0xheW91dFRlc3RzL2pz L3NjcmlwdC10ZXN0cy9hcnJvd2Z1bmN0aW9uLXN1cGVycHJvcGVydHkuanMKaW5kZXggMmY1ODdm ZDU3MjI2NmFjOTZkODNkYTIxZTQ5NTVlMzFmMjVlOTU3Ni4uNWIyNmZmZjM4ZWVkZjIyOGUxN2Y1 Y2ExZTNhZTU2NTdjMjJlZWZjZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvanMvc2NyaXB0LXRl c3RzL2Fycm93ZnVuY3Rpb24tc3VwZXJwcm9wZXJ0eS5qcworKysgYi9MYXlvdXRUZXN0cy9qcy9z Y3JpcHQtdGVzdHMvYXJyb3dmdW5jdGlvbi1zdXBlcnByb3BlcnR5LmpzCkBAIC02Myw2ICs2Mywx NCBAQCBjbGFzcyBGIGV4dGVuZHMgQSB7CiAgICAgICAgIGxldCBhcnJvdyA9ICgpID0+ICgpID0+ IHN1cGVyLmdldFZhbHVlKCk7CiAgICAgICAgIHJldHVybiBhcnJvdygpKCk7CiAgICAgfQorICAg ICpnZW5HZXRQYXJlbnRWYWx1ZSgpIHsKKyAgICAgICAgbGV0IGFyciA9ICgpID0+IHN1cGVyLmdl dFZhbHVlKCk7CisgICAgICAgIHlpZWxkIGFycigpOworICAgIH0KKyAgICAqZ2VuR2V0UGFyZW50 VmFsdWVEZWVwQXJyb3coKSB7CisgICAgICAgIGxldCBhcnIgPSAoKSA9PiAoKSA9PiAoKSA9PiBz dXBlci5nZXRWYWx1ZSgpOworICAgICAgICB5aWVsZCBhcnIoKSgpKCk7CisgICAgfQogIH07CiAK IHNob3VsZEJlKCcobmV3IEIoKSkuZ2V0VmFsdWVQYXJlbnRGdW5jdGlvbigpJywgJ2V4cGVjdGVk VmFsdWUnKTsKQEAgLTg0LDQgKzkyLDcgQEAgc2hvdWxkQmUoJ2YucHJvcCcsICdleHBlY3RlZFZh bHVlICsgIi0iICsgIm5ldy12YWx1ZSInKTsKIAogc2hvdWxkQmUoJyhuZXcgRigpKS5nZXRQYXJl bnRWYWx1ZSgpJywgJ2V4cGVjdGVkVmFsdWUnKTsKIAorc2hvdWxkQmUoJyhuZXcgRigpKS5nZW5H ZXRQYXJlbnRWYWx1ZSgpLm5leHQoKS52YWx1ZScsICdleHBlY3RlZFZhbHVlJyk7CitzaG91bGRC ZSgnKG5ldyBGKCkpLmdlbkdldFBhcmVudFZhbHVlRGVlcEFycm93KCkubmV4dCgpLnZhbHVlJywg J2V4cGVjdGVkVmFsdWUnKTsKKwogdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cg==