201853 2019-09-16 18:22:12 -0700 CheckArray on DirectArguments/ScopedArguments does not filter out slow put array storage 2019-09-17 09:32:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov guijemont keith_miller mark.lam msaboff rmorisset ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1571369 0 saam 2019-09-16 18:22:12 -0700 ... 1571370 1 saam 2019-09-16 18:23:12 -0700 <rdar://problem/53805461> 1571375 2 378924 saam 2019-09-16 18:29:40 -0700 Created attachment 378924 patch 1571377 3 378924 ysuzuki 2019-09-16 18:32:14 -0700 Comment on attachment 378924 patch View in context: https://bugs.webkit.org/attachment.cgi?id=378924&action=review r=me with comment. > Source/JavaScriptCore/dfg/DFGArrayMode.h:447 > + return arrayModesWithIndexingShapes(ArrayStorageShape, NonArray) | arrayModesWithIndexingShapes(SlowPutArrayStorageShape, NonArray); Should we just do like, `arrayModesWithIndexingShapes(NonArray, ArrayStorageShape, SlowPutArrayStorageShape)`? 1571380 4 378924 saam 2019-09-16 18:48:43 -0700 Comment on attachment 378924 patch View in context: https://bugs.webkit.org/attachment.cgi?id=378924&action=review >> Source/JavaScriptCore/dfg/DFGArrayMode.h:447 >> + return arrayModesWithIndexingShapes(ArrayStorageShape, NonArray) | arrayModesWithIndexingShapes(SlowPutArrayStorageShape, NonArray); > > Should we just do like, `arrayModesWithIndexingShapes(NonArray, ArrayStorageShape, SlowPutArrayStorageShape)`? yes, I meant to do that :) 1571381 5 378925 saam 2019-09-16 18:50:13 -0700 Created attachment 378925 patch for landing 1571565 6 378925 commit-queue 2019-09-17 09:32:18 -0700 Comment on attachment 378925 patch for landing Clearing flags on attachment: 378925 Committed r249959: <https://trac.webkit.org/changeset/249959> 1571566 7 commit-queue 2019-09-17 09:32:20 -0700 All reviewed patches have been landed. Closing bug. 378924 2019-09-16 18:29:40 -0700 2019-09-16 18:50:13 -0700 patch b-backup.diff text/plain 4947 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDk5MzMpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE5LTA5LTE2ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIENoZWNrQXJyYXkgb24gRGlyZWN0QXJndW1lbnRzL1Njb3BlZEFyZ3Vt ZW50cyBkb2VzIG5vdCBmaWx0ZXIgb3V0IHNsb3cgcHV0IGFycmF5IHN0b3JhZ2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTg1MworICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTM4MDU0NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvZGlyZWN0LWFyZ3VtZW50cy1jaGVjay1hcnJheS1m aWx0ZXItdHlwZS5qczogQWRkZWQuCisgICAgICAgIChmb28pOgorCiAyMDE5LTA5LTE2ICBNaWNo YWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgogCiAgICAgICAgIFtKU0NdIFBlcmZvcm0g Y2hlY2sgYWdhaW4gd2hlbiB3ZSBmb3VuZCBub24tQk1QIGNoYXJhY3RlcnMKSW5kZXg6IEpTVGVz dHMvc3RyZXNzL2RpcmVjdC1hcmd1bWVudHMtY2hlY2stYXJyYXktZmlsdGVyLXR5cGUuanMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gSlNUZXN0cy9zdHJlc3MvZGlyZWN0LWFyZ3VtZW50cy1jaGVjay1hcnJheS1m aWx0ZXItdHlwZS5qcwkobm9uZXhpc3RlbnQpCisrKyBKU1Rlc3RzL3N0cmVzcy9kaXJlY3QtYXJn dW1lbnRzLWNoZWNrLWFycmF5LWZpbHRlci10eXBlLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAg KzEsMTIgQEAKKy8vQCBydW5EZWZhdWx0KCItLWppdFBvbGljeVNjYWxlPTAiLCAiLS11c2VSYW5k b21pemluZ0Z1enplckFnZW50PTEiLCAiLS12YWxpZGF0ZUFic3RyYWN0SW50ZXJwcmV0ZXJTdGF0 ZT0xIiwgIi0tdmFsaWRhdGVBYnN0cmFjdEludGVycHJldGVyU3RhdGVQcm9iYWJpbGl0eT0xLjAi LCAgIi0tdXNlQ29uY3VycmVudEpJVD0wIikKKworZnVuY3Rpb24gZm9vKGEwLCBhMSkgeworICAg IEZ1bmN0aW9uLl9fZGVmaW5lU2V0dGVyX18oMCwgKCk9Pnt9KTsKKyAgICBPYmplY3QuZnJlZXpl KGFyZ3VtZW50cyk7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAzOyBpKyspIHt9CisgICAgYXJn dW1lbnRzWzBdOworICAgIGNvbnN0IHggPSAwOworICAgIGNvbnN0IHkgPSAwOworfQorCitmb28o KTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQ5OTExKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIw IEBACisyMDE5LTA5LTE2ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAg ICAgIENoZWNrQXJyYXkgb24gRGlyZWN0QXJndW1lbnRzL1Njb3BlZEFyZ3VtZW50cyBkb2VzIG5v dCBmaWx0ZXIgb3V0IHNsb3cgcHV0IGFycmF5IHN0b3JhZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTg1MworICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNTM4MDU0NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2Ugd2VyZSBjbGFpbWluZyBDaGVja0FycmF5IGZvciBTY29wZWRBcmd1bWVudHMvRGly ZWN0QXJndW1lbnRzIHdhcyBmaWx0ZXJpbmcKKyAgICAgICAgb3V0IFNsb3dQdXRBcnJheVN0b3Jh Z2UuIEl0IGRvZXMgbm8gc3VjaCB0aGluZy4gV2UganVzdCBjaGVjayB0aGF0IHRoZSBvYmplY3QK KyAgICAgICAgaXMgZWl0aGVyIFNjb3BlZEFyZ3VtZW50cy9EaXJlY3RBcmd1bWVudHMuCisKKyAg ICAgICAgKiBkZmcvREZHQXJyYXlNb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6QXJyYXlNb2Rl OjphcnJheU1vZGVzVGhhdFBhc3NGaWx0ZXJpbmcgY29uc3QpOgorICAgICAgICAoSlNDOjpERkc6 OkFycmF5TW9kZTo6YXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlcyBjb25zdCk6CisgICAgICAg IChKU0M6OkRGRzo6QXJyYXlNb2RlOjphcnJheU1vZGVzV2l0aEluZGV4aW5nU2hhcGUgY29uc3Qp OiBEZWxldGVkLgorCiAyMDE5LTA5LTE2ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29t PgogCiAgICAgICAgIEpTT2JqZWN0OjpwdXRJbmxpbmVTbG93IHNob3VsZCBub3QgaWdub3JlICJf X3Byb3RvX18iIGZvciBQcm94eQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdB cnJheU1vZGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fy cmF5TW9kZS5oCShyZXZpc2lvbiAyNDk5MTEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR0FycmF5TW9kZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MzAsMjEgKzQzMCwyMSBAQCBwdWJs aWM6CiAgICAgICAgIGNhc2UgQXJyYXk6OkdlbmVyaWM6CiAgICAgICAgICAgICByZXR1cm4gQUxM X0FSUkFZX01PREVTOwogICAgICAgICBjYXNlIEFycmF5OjpJbnQzMjoKLSAgICAgICAgICAgIHJl c3VsdCA9IGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZShJbnQzMlNoYXBlKTsKKyAgICAgICAg ICAgIHJlc3VsdCA9IGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMoSW50MzJTaGFwZSk7CiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBcnJheTo6RG91YmxlOgotICAgICAgICAg ICAgcmVzdWx0ID0gYXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlKERvdWJsZVNoYXBlKTsKKyAg ICAgICAgICAgIHJlc3VsdCA9IGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMoRG91YmxlU2hh cGUpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQXJyYXk6OkNvbnRpZ3VvdXM6 Ci0gICAgICAgICAgICByZXN1bHQgPSBhcnJheU1vZGVzV2l0aEluZGV4aW5nU2hhcGUoQ29udGln dW91c1NoYXBlKTsKKyAgICAgICAgICAgIHJlc3VsdCA9IGFycmF5TW9kZXNXaXRoSW5kZXhpbmdT aGFwZXMoQ29udGlndW91c1NoYXBlKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNl IEFycmF5OjpBcnJheVN0b3JhZ2U6Ci0gICAgICAgICAgICByZXR1cm4gYXJyYXlNb2Rlc1dpdGhJ bmRleGluZ1NoYXBlKEFycmF5U3RvcmFnZVNoYXBlKTsKKyAgICAgICAgICAgIHJldHVybiBhcnJh eU1vZGVzV2l0aEluZGV4aW5nU2hhcGVzKEFycmF5U3RvcmFnZVNoYXBlKTsKICAgICAgICAgY2Fz ZSBBcnJheTo6U2xvd1B1dEFycmF5U3RvcmFnZToKICAgICAgICAgICAgIHJldHVybiBhcnJheU1v ZGVzV2l0aEluZGV4aW5nU2hhcGVzKFNsb3dQdXRBcnJheVN0b3JhZ2VTaGFwZSwgQXJyYXlTdG9y YWdlU2hhcGUpOwogICAgICAgICBjYXNlIEFycmF5OjpEaXJlY3RBcmd1bWVudHM6CiAgICAgICAg IGNhc2UgQXJyYXk6OlNjb3BlZEFyZ3VtZW50czoKLSAgICAgICAgICAgIHJldHVybiBhcnJheU1v ZGVzV2l0aEluZGV4aW5nU2hhcGVzKEFycmF5U3RvcmFnZVNoYXBlLCBOb25BcnJheSk7CisgICAg ICAgICAgICByZXR1cm4gYXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlcyhBcnJheVN0b3JhZ2VT aGFwZSwgTm9uQXJyYXkpIHwgYXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlcyhTbG93UHV0QXJy YXlTdG9yYWdlU2hhcGUsIE5vbkFycmF5KTsKICAgICAgICAgY2FzZSBBcnJheTo6SW50OEFycmF5 OgogICAgICAgICAgICAgcmV0dXJuIEludDhBcnJheU1vZGU7CiAgICAgICAgIGNhc2UgQXJyYXk6 OkludDE2QXJyYXk6CkBAIC01MTIsNyArNTEyLDcgQEAgcHJpdmF0ZToKICAgICAgICAgdS5hc1dv cmQgPSB3b3JkOwogICAgIH0KICAgICAKLSAgICBBcnJheU1vZGVzIGFycmF5TW9kZXNXaXRoSW5k ZXhpbmdTaGFwZShJbmRleGluZ1R5cGUgc2hhcGUpIGNvbnN0CisgICAgQXJyYXlNb2RlcyBhcnJh eU1vZGVzV2l0aEluZGV4aW5nU2hhcGVzKEluZGV4aW5nVHlwZSBzaGFwZSkgY29uc3QKICAgICB7 CiAgICAgICAgIHN3aXRjaCAoYXJyYXlDbGFzcygpKSB7CiAgICAgICAgIGNhc2UgQXJyYXk6Ok5v bkFycmF5OgpAQCAtNTM3LDEwICs1MzcsMTEgQEAgcHJpdmF0ZToKICAgICAgICAgfQogICAgIH0K ICAgICAKLSAgICBBcnJheU1vZGVzIGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMoSW5kZXhp bmdUeXBlIHNoYXBlMSwgSW5kZXhpbmdUeXBlIHNoYXBlMikgY29uc3QKKyAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUuLi4gQXJncz4KKyAgICBBcnJheU1vZGVzIGFycmF5TW9kZXNXaXRoSW5kZXhpbmdT aGFwZXMoSW5kZXhpbmdUeXBlIHNoYXBlMSwgQXJncy4uLiBhcmdzKSBjb25zdAogICAgIHsKLSAg ICAgICAgQXJyYXlNb2RlcyBhcnJheU1vZGUxID0gYXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBl KHNoYXBlMSk7Ci0gICAgICAgIEFycmF5TW9kZXMgYXJyYXlNb2RlMiA9IGFycmF5TW9kZXNXaXRo SW5kZXhpbmdTaGFwZShzaGFwZTIpOworICAgICAgICBBcnJheU1vZGVzIGFycmF5TW9kZTEgPSBh cnJheU1vZGVzV2l0aEluZGV4aW5nU2hhcGVzKHNoYXBlMSk7CisgICAgICAgIEFycmF5TW9kZXMg YXJyYXlNb2RlMiA9IGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMoYXJncy4uLik7CiAgICAg ICAgIHJldHVybiBhcnJheU1vZGUxIHwgYXJyYXlNb2RlMjsKICAgICB9CiAK 378925 2019-09-16 18:50:13 -0700 2019-09-17 09:32:18 -0700 patch for landing b-backup.diff text/plain 4904 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNDk5MzMpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE5LTA5LTE2ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIENoZWNrQXJyYXkgb24gRGlyZWN0QXJndW1lbnRzL1Njb3BlZEFyZ3Vt ZW50cyBkb2VzIG5vdCBmaWx0ZXIgb3V0IHNsb3cgcHV0IGFycmF5IHN0b3JhZ2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTg1MworICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNTM4MDU0NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWXVzdWtlIFN1 enVraS4KKworICAgICAgICAqIHN0cmVzcy9kaXJlY3QtYXJndW1lbnRzLWNoZWNrLWFycmF5LWZp bHRlci10eXBlLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvbyk6CisKIDIwMTktMDktMTYgIE1pY2hh ZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gUGVyZm9ybSBj aGVjayBhZ2FpbiB3aGVuIHdlIGZvdW5kIG5vbi1CTVAgY2hhcmFjdGVycwpJbmRleDogSlNUZXN0 cy9zdHJlc3MvZGlyZWN0LWFyZ3VtZW50cy1jaGVjay1hcnJheS1maWx0ZXItdHlwZS5qcwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBKU1Rlc3RzL3N0cmVzcy9kaXJlY3QtYXJndW1lbnRzLWNoZWNrLWFycmF5LWZp bHRlci10eXBlLmpzCShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2RpcmVjdC1hcmd1 bWVudHMtY2hlY2stYXJyYXktZmlsdGVyLXR5cGUuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCAr MSwxMiBAQAorLy9AIHJ1bkRlZmF1bHQoIi0taml0UG9saWN5U2NhbGU9MCIsICItLXVzZVJhbmRv bWl6aW5nRnV6emVyQWdlbnQ9MSIsICItLXZhbGlkYXRlQWJzdHJhY3RJbnRlcnByZXRlclN0YXRl PTEiLCAiLS12YWxpZGF0ZUFic3RyYWN0SW50ZXJwcmV0ZXJTdGF0ZVByb2JhYmlsaXR5PTEuMCIs ICAiLS11c2VDb25jdXJyZW50SklUPTAiKQorCitmdW5jdGlvbiBmb28oYTAsIGExKSB7CisgICAg RnVuY3Rpb24uX19kZWZpbmVTZXR0ZXJfXygwLCAoKT0+e30pOworICAgIE9iamVjdC5mcmVlemUo YXJndW1lbnRzKTsKKyAgICBmb3IgKGxldCBpID0gMDsgaSA8IDM7IGkrKykge30KKyAgICBhcmd1 bWVudHNbMF07CisgICAgY29uc3QgeCA9IDA7CisgICAgY29uc3QgeSA9IDA7Cit9CisKK2Zvbygp OwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDk5MTEpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTktMDktMTYgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisKKyAgICAg ICAgQ2hlY2tBcnJheSBvbiBEaXJlY3RBcmd1bWVudHMvU2NvcGVkQXJndW1lbnRzIGRvZXMgbm90 IGZpbHRlciBvdXQgc2xvdyBwdXQgYXJyYXkgc3RvcmFnZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODUzCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS81MzgwNTQ2MT4KKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAg ICAgIFdlIHdlcmUgY2xhaW1pbmcgQ2hlY2tBcnJheSBmb3IgU2NvcGVkQXJndW1lbnRzL0RpcmVj dEFyZ3VtZW50cyB3YXMgZmlsdGVyaW5nCisgICAgICAgIG91dCBTbG93UHV0QXJyYXlTdG9yYWdl LiBJdCBkb2VzIG5vIHN1Y2ggdGhpbmcuIFdlIGp1c3QgY2hlY2sgdGhhdCB0aGUgb2JqZWN0Cisg ICAgICAgIGlzIGVpdGhlciBTY29wZWRBcmd1bWVudHMvRGlyZWN0QXJndW1lbnRzLgorCisgICAg ICAgICogZGZnL0RGR0FycmF5TW9kZS5oOgorICAgICAgICAoSlNDOjpERkc6OkFycmF5TW9kZTo6 YXJyYXlNb2Rlc1RoYXRQYXNzRmlsdGVyaW5nIGNvbnN0KToKKyAgICAgICAgKEpTQzo6REZHOjpB cnJheU1vZGU6OmFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMgY29uc3QpOgorICAgICAgICAo SlNDOjpERkc6OkFycmF5TW9kZTo6YXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlIGNvbnN0KTog RGVsZXRlZC4KKwogMjAxOS0wOS0xNiAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4K IAogICAgICAgICBKU09iamVjdDo6cHV0SW5saW5lU2xvdyBzaG91bGQgbm90IGlnbm9yZSAiX19w cm90b19fIiBmb3IgUHJveHkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQXJy YXlNb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdBcnJh eU1vZGUuaAkocmV2aXNpb24gMjQ5OTExKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdBcnJheU1vZGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDMwLDIxICs0MzAsMjEgQEAgcHVibGlj OgogICAgICAgICBjYXNlIEFycmF5OjpHZW5lcmljOgogICAgICAgICAgICAgcmV0dXJuIEFMTF9B UlJBWV9NT0RFUzsKICAgICAgICAgY2FzZSBBcnJheTo6SW50MzI6Ci0gICAgICAgICAgICByZXN1 bHQgPSBhcnJheU1vZGVzV2l0aEluZGV4aW5nU2hhcGUoSW50MzJTaGFwZSk7CisgICAgICAgICAg ICByZXN1bHQgPSBhcnJheU1vZGVzV2l0aEluZGV4aW5nU2hhcGVzKEludDMyU2hhcGUpOwogICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgQXJyYXk6OkRvdWJsZToKLSAgICAgICAgICAg IHJlc3VsdCA9IGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZShEb3VibGVTaGFwZSk7CisgICAg ICAgICAgICByZXN1bHQgPSBhcnJheU1vZGVzV2l0aEluZGV4aW5nU2hhcGVzKERvdWJsZVNoYXBl KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEFycmF5OjpDb250aWd1b3VzOgot ICAgICAgICAgICAgcmVzdWx0ID0gYXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlKENvbnRpZ3Vv dXNTaGFwZSk7CisgICAgICAgICAgICByZXN1bHQgPSBhcnJheU1vZGVzV2l0aEluZGV4aW5nU2hh cGVzKENvbnRpZ3VvdXNTaGFwZSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBB cnJheTo6QXJyYXlTdG9yYWdlOgotICAgICAgICAgICAgcmV0dXJuIGFycmF5TW9kZXNXaXRoSW5k ZXhpbmdTaGFwZShBcnJheVN0b3JhZ2VTaGFwZSk7CisgICAgICAgICAgICByZXR1cm4gYXJyYXlN b2Rlc1dpdGhJbmRleGluZ1NoYXBlcyhBcnJheVN0b3JhZ2VTaGFwZSk7CiAgICAgICAgIGNhc2Ug QXJyYXk6OlNsb3dQdXRBcnJheVN0b3JhZ2U6CiAgICAgICAgICAgICByZXR1cm4gYXJyYXlNb2Rl c1dpdGhJbmRleGluZ1NoYXBlcyhTbG93UHV0QXJyYXlTdG9yYWdlU2hhcGUsIEFycmF5U3RvcmFn ZVNoYXBlKTsKICAgICAgICAgY2FzZSBBcnJheTo6RGlyZWN0QXJndW1lbnRzOgogICAgICAgICBj YXNlIEFycmF5OjpTY29wZWRBcmd1bWVudHM6Ci0gICAgICAgICAgICByZXR1cm4gYXJyYXlNb2Rl c1dpdGhJbmRleGluZ1NoYXBlcyhBcnJheVN0b3JhZ2VTaGFwZSwgTm9uQXJyYXkpOworICAgICAg ICAgICAgcmV0dXJuIGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMoQXJyYXlTdG9yYWdlU2hh cGUsIFNsb3dQdXRBcnJheVN0b3JhZ2VTaGFwZSwgTm9uQXJyYXkpOwogICAgICAgICBjYXNlIEFy cmF5OjpJbnQ4QXJyYXk6CiAgICAgICAgICAgICByZXR1cm4gSW50OEFycmF5TW9kZTsKICAgICAg ICAgY2FzZSBBcnJheTo6SW50MTZBcnJheToKQEAgLTUxMiw3ICs1MTIsNyBAQCBwcml2YXRlOgog ICAgICAgICB1LmFzV29yZCA9IHdvcmQ7CiAgICAgfQogICAgIAotICAgIEFycmF5TW9kZXMgYXJy YXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlKEluZGV4aW5nVHlwZSBzaGFwZSkgY29uc3QKKyAgICBB cnJheU1vZGVzIGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMoSW5kZXhpbmdUeXBlIHNoYXBl KSBjb25zdAogICAgIHsKICAgICAgICAgc3dpdGNoIChhcnJheUNsYXNzKCkpIHsKICAgICAgICAg Y2FzZSBBcnJheTo6Tm9uQXJyYXk6CkBAIC01MzcsMTAgKzUzNywxMSBAQCBwcml2YXRlOgogICAg ICAgICB9CiAgICAgfQogICAgIAotICAgIEFycmF5TW9kZXMgYXJyYXlNb2Rlc1dpdGhJbmRleGlu Z1NoYXBlcyhJbmRleGluZ1R5cGUgc2hhcGUxLCBJbmRleGluZ1R5cGUgc2hhcGUyKSBjb25zdAor ICAgIHRlbXBsYXRlIDx0eXBlbmFtZS4uLiBBcmdzPgorICAgIEFycmF5TW9kZXMgYXJyYXlNb2Rl c1dpdGhJbmRleGluZ1NoYXBlcyhJbmRleGluZ1R5cGUgc2hhcGUxLCBBcmdzLi4uIGFyZ3MpIGNv bnN0CiAgICAgewotICAgICAgICBBcnJheU1vZGVzIGFycmF5TW9kZTEgPSBhcnJheU1vZGVzV2l0 aEluZGV4aW5nU2hhcGUoc2hhcGUxKTsKLSAgICAgICAgQXJyYXlNb2RlcyBhcnJheU1vZGUyID0g YXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlKHNoYXBlMik7CisgICAgICAgIEFycmF5TW9kZXMg YXJyYXlNb2RlMSA9IGFycmF5TW9kZXNXaXRoSW5kZXhpbmdTaGFwZXMoc2hhcGUxKTsKKyAgICAg ICAgQXJyYXlNb2RlcyBhcnJheU1vZGUyID0gYXJyYXlNb2Rlc1dpdGhJbmRleGluZ1NoYXBlcyhh cmdzLi4uKTsKICAgICAgICAgcmV0dXJuIGFycmF5TW9kZTEgfCBhcnJheU1vZGUyOwogICAgIH0K IAo=