183897 2018-03-22 07:10:48 -0700 [JSC] List up all candidates in DFGCapabilities and FTLCapabilities 2018-03-25 10:27:36 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist fpizlo keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1408342 0 ysuzuki 2018-03-22 07:10:48 -0700 [JSC] List up all candidates in DFGCapabilities and FTLCapabilities 1408344 1 336277 ysuzuki 2018-03-22 07:13:37 -0700 Created attachment 336277 Patch 1408357 2 336277 ysuzuki 2018-03-22 07:46:34 -0700 Comment on attachment 336277 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336277&action=review > Source/JavaScriptCore/dfg/DFGCapabilities.cpp:276 > + case op_put_by_index: This "op_put_by_index" should be removed. Done in https://bugs.webkit.org/show_bug.cgi?id=183899. 1408360 3 336277 mark.lam 2018-03-22 07:53:21 -0700 Comment on attachment 336277 Patch r=me 1408368 4 ysuzuki 2018-03-22 07:57:54 -0700 (In reply to Mark Lam from comment #3) > Comment on attachment 336277 [details] > Patch > > r=me During this fix, I've just found one issue in our FTLLowerToDFG code: PutByVal does not use modeForPut for its ArrayMode. It will fix jsc test failures in the current patch. I'll land it after EWS becomes green :D 1408369 5 336283 ysuzuki 2018-03-22 07:59:31 -0700 Created attachment 336283 Patch for landing 1408379 6 336277 ews-watchlist 2018-03-22 08:29:54 -0700 Comment on attachment 336277 Patch Attachment 336277 did not pass jsc-ews (mac): Output: http://webkit-queues.webkit.org/results/7063579 New failing tests: stress/parameter-scoping.js.ftl-eager-no-cjit microbenchmarks/external-arguments-putbyval.js.ftl-no-cjit-b3o1 stress/arguments-callee-uninitialized.js.ftl-no-cjit-small-pool stress/arguments-callee-uninitialized.js.ftl-eager microbenchmarks/external-arguments-putbyval.js.ftl-no-cjit-no-put-stack-validate microbenchmarks/external-arguments-putbyval.js.ftl-no-cjit-validate-sampling-profiler stress/arguments-callee-uninitialized.js.ftl-no-cjit-validate-sampling-profiler stress/broken-have-a-bad-time-with-arguments-for-gc-testing.js.misc-ftl-no-cjit stress/arguments-captured.js.ftl-eager-no-cjit-b3o1 stress/have-a-bad-time-with-arguments.js.misc-ftl-no-cjit microbenchmarks/external-arguments-putbyval.js.ftl-eager-no-cjit stress/arguments-callee-uninitialized.js.ftl-eager-no-cjit-b3o1 microbenchmarks/external-arguments-putbyval.js.ftl-no-cjit-no-inline-validate stress/arguments-callee-uninitialized.js.ftl-no-cjit-no-put-stack-validate stress/arguments-callee-uninitialized.js.ftl-no-cjit-b3o1 stress/arguments-captured.js.ftl-eager stress/arguments-captured.js.ftl-eager-no-cjit microbenchmarks/external-arguments-putbyval.js.ftl-eager-no-cjit-b3o1 stress/parameter-scoping.js.ftl-eager-no-cjit-b3o1 microbenchmarks/external-arguments-putbyval.js.ftl-eager stress/arguments-callee-uninitialized.js.ftl-no-cjit-no-inline-validate stress/arguments-callee-uninitialized.js.ftl-eager-no-cjit stress/parameter-scoping.js.ftl-eager 1408387 7 ysuzuki 2018-03-22 08:59:06 -0700 Committed r229854: <https://trac.webkit.org/changeset/229854> 1408388 8 webkit-bug-importer 2018-03-22 09:00:42 -0700 <rdar://problem/38753339> 1409182 9 336283 saam 2018-03-25 10:27:36 -0700 Comment on attachment 336283 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=336283&action=review > Source/JavaScriptCore/dfg/DFGCapabilities.cpp:292 > + case op_put_by_index: > + case op_yield: > + case llint_program_prologue: > + case llint_eval_prologue: > + case llint_module_program_prologue: > + case llint_function_for_call_prologue: > + case llint_function_for_construct_prologue: > + case llint_function_for_call_arity_check: > + case llint_function_for_construct_arity_check: > + case llint_generic_return_point: > + case llint_throw_from_slow_path_trampoline: > + case llint_throw_during_call_trampoline: > + case llint_native_call_trampoline: > + case llint_native_construct_trampoline: > + case llint_internal_function_call_trampoline: > + case llint_internal_function_construct_trampoline: > + case handleUncaughtException: Shouldn't all these be crashes besides put_by_index? 336277 2018-03-22 07:13:37 -0700 2018-03-22 08:29:54 -0700 Patch bug-183897-20180322231336.patch text/plain 7458 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5ODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZWE4YTAwMjYxZjkyZTY5MjQ3NTM3NjRkMzk5ZDY2Zjc2YjlhN2E1Li5hMzIyZjc3ZjY2Yjc1MDRh Nzk3MTdhNTBlMGM1ODI2NDkyZmM5MTJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxOC0wMy0yMiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBMaXN0IHVwIGFsbCBjYW5kaWRhdGVzIGluIERGR0NhcGFi aWxpdGllcyBhbmQgRlRMQ2FwYWJpbGl0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODM4OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZSBzaG91bGQgbm90IHVzZSBgZGVmYXVsdDpgIGNsYXVzZSBo ZXJlIHNpbmNlIGl0IGFjY2lkZW50YWxseSBjYXRjaGVzCisgICAgICAgIHRoZSBvcGNvZGUgYW5k IERGRyBub2RlcyB3aGljaCBzaG91bGQgYmUgb3B0aW1pemVkLiBGb3IgZXhhbXBsZSwKKyAgICAg ICAgb3Bfc3VwZXJfc2FtcGxlcl9iZWdpbiBhbmQgb3Bfc3VwZXJfc2FtcGxlcl9lbmQgYXJlIG5v dCBsaXN0ZWQgd2hpbGUKKyAgICAgICAgdGhleSBoYXZlIERGRyBhbmQgRlRMIGJhY2tlbmQuCisK KyAgICAgICAgVGhpcyBwYXRjaCBsaXN0cyB1cCBhbGwgY2FuZGlhdGVzIGluIERGR0NhcGFiaWxp dGllcyBhbmQgRlRMQ2FwYWJpbGl0aWVzLgorICAgICAgICBBbmQgd2UgYWxzbyBjbGVhbiB1cCB1 bm5lY2Vzc2FyeSBjaGVja3MgaW4gRlRMQ2FwYWJpbGl0aWVzLiBTaW5jZSB3ZQorICAgICAgICBh bHJlYWR5IGhhbmRsZXMgYWxsIHRoZSBwb3NzaWJsZSBhcnJheSB0eXBlcyBmb3IgdGhlc2Ugbm9k ZXMgKHdoaWNoIGNhbgorICAgICAgICBiZSBjaGVja2VkIGluIERGRydzIGNvZGUpLCB3ZSBkbyBu b3QgbmVlZCB0byBjaGVjayBhcnJheSB0eXBlcy4KKworICAgICAgICAqIGRmZy9ERkdDYXBhYmls aXRpZXMuY3BwOgorICAgICAgICAoSlNDOjpERkc6OmNhcGFiaWxpdHlMZXZlbCk6CisgICAgICAg ICogZnRsL0ZUTENhcGFiaWxpdGllcy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6Y2FuQ29tcGls ZSk6CisKIDIwMTgtMDMtMjEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAg ICAgICBTY29wZWRBcmd1bWVudHMgc2hvdWxkIGRvIHBvaXNvbmluZyBhbmQgaW5kZXggbWFza2lu ZwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDYXBhYmlsaXRpZXMu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDYXBhYmlsaXRpZXMuY3BwCmluZGV4 IGQ1NjcwOWI3MTliYWYzZGNlOWQyZmMwZWUyZTlhYjg4NzE4ZDdjNDQuLjhjZTJmNWI1MWQyNTc3 NTQxOGNmZWRkZDRlNzdkODc4ODMyZmUwYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQ2FwYWJpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0NhcGFiaWxpdGllcy5jcHAKQEAgLTI2NSwxMyArMjY1LDMxIEBAIENhcGFiaWxpdHlM ZXZlbCBjYXBhYmlsaXR5TGV2ZWwoT3Bjb2RlSUQgb3Bjb2RlSUQsIENvZGVCbG9jayogY29kZUJs b2NrLCBJbnN0cnVjCiAgICAgY2FzZSBvcF9yZXNvbHZlX3Njb3BlX2Zvcl9ob2lzdGluZ19mdW5j X2RlY2xfaW5fZXZhbDoKICAgICBjYXNlIG9wX25ld19yZWdleHA6CiAgICAgY2FzZSBvcF91bnJl YWNoYWJsZToKKyAgICBjYXNlIG9wX3N1cGVyX3NhbXBsZXJfYmVnaW46CisgICAgY2FzZSBvcF9z dXBlcl9zYW1wbGVyX2VuZDoKICAgICAgICAgcmV0dXJuIENhbkNvbXBpbGVBbmRJbmxpbmU7CiAK ICAgICBjYXNlIG9wX3N3aXRjaF9zdHJpbmc6IC8vIERvbid0IGlubGluZSBiZWNhdXNlIHdlIGRv bid0IHdhbnQgdG8gY29weSBzdHJpbmcgdGFibGVzIGluIHRoZSBjb25jdXJyZW50IEpJVC4KICAg ICBjYXNlIG9wX2NhbGxfZXZhbDoKICAgICAgICAgcmV0dXJuIENhbkNvbXBpbGU7CiAKLSAgICBk ZWZhdWx0OgorICAgIGNhc2Ugb3BfcHV0X2J5X2luZGV4OgorICAgIGNhc2Ugb3BfeWllbGQ6Cisg ICAgY2FzZSBsbGludF9wcm9ncmFtX3Byb2xvZ3VlOgorICAgIGNhc2UgbGxpbnRfZXZhbF9wcm9s b2d1ZToKKyAgICBjYXNlIGxsaW50X21vZHVsZV9wcm9ncmFtX3Byb2xvZ3VlOgorICAgIGNhc2Ug bGxpbnRfZnVuY3Rpb25fZm9yX2NhbGxfcHJvbG9ndWU6CisgICAgY2FzZSBsbGludF9mdW5jdGlv bl9mb3JfY29uc3RydWN0X3Byb2xvZ3VlOgorICAgIGNhc2UgbGxpbnRfZnVuY3Rpb25fZm9yX2Nh bGxfYXJpdHlfY2hlY2s6CisgICAgY2FzZSBsbGludF9mdW5jdGlvbl9mb3JfY29uc3RydWN0X2Fy aXR5X2NoZWNrOgorICAgIGNhc2UgbGxpbnRfZ2VuZXJpY19yZXR1cm5fcG9pbnQ6CisgICAgY2Fz ZSBsbGludF90aHJvd19mcm9tX3Nsb3dfcGF0aF90cmFtcG9saW5lOgorICAgIGNhc2UgbGxpbnRf dGhyb3dfZHVyaW5nX2NhbGxfdHJhbXBvbGluZToKKyAgICBjYXNlIGxsaW50X25hdGl2ZV9jYWxs X3RyYW1wb2xpbmU6CisgICAgY2FzZSBsbGludF9uYXRpdmVfY29uc3RydWN0X3RyYW1wb2xpbmU6 CisgICAgY2FzZSBsbGludF9pbnRlcm5hbF9mdW5jdGlvbl9jYWxsX3RyYW1wb2xpbmU6CisgICAg Y2FzZSBsbGludF9pbnRlcm5hbF9mdW5jdGlvbl9jb25zdHJ1Y3RfdHJhbXBvbGluZToKKyAgICBj YXNlIGhhbmRsZVVuY2F1Z2h0RXhjZXB0aW9uOgogICAgICAgICByZXR1cm4gQ2Fubm90Q29tcGls ZTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTENh cGFiaWxpdGllcy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTENhcGFiaWxpdGll cy5jcHAKaW5kZXggNzU0YTFlNjE2MjA3ZWIwY2M5ZTQ0MWMxMmZkNzViNTQ3MmZkYzFjOC4uN2My NzE3OTc2ODg5NjkwZWU4ZDYyMDA2NjBlMmVlNjZmMDYzNTAzZCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2Z0bC9GVExDYXBhYmlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMQ2FwYWJpbGl0aWVzLmNwcApAQCAtMTc1LDYgKzE3NSw3IEBAIGlu bGluZSBDYXBhYmlsaXR5TGV2ZWwgY2FuQ29tcGlsZShOb2RlKiBub2RlKQogICAgIGNhc2UgQ29u c3RhbnRTdG9yYWdlUG9pbnRlcjoKICAgICBjYXNlIENoZWNrOgogICAgIGNhc2UgQ2hlY2tWYXJh cmdzOgorICAgIGNhc2UgQ2hlY2tBcnJheToKICAgICBjYXNlIENvdW50RXhlY3V0aW9uOgogICAg IGNhc2UgU3VwZXJTYW1wbGVyQmVnaW46CiAgICAgY2FzZSBTdXBlclNhbXBsZXJFbmQ6CkBAIC0z MzcsMTAzICszMzgsMzQgQEAgaW5saW5lIENhcGFiaWxpdHlMZXZlbCBjYW5Db21waWxlKE5vZGUq IG5vZGUpCiAgICAgY2FzZSBJbml0aWFsaXplRW50cnlwb2ludEFyZ3VtZW50czoKICAgICBjYXNl IENQVUludHJpbnNpYzoKICAgICBjYXNlIEdldEFycmF5TWFzazoKLSAgICAgICAgLy8gVGhlc2Ug YXJlIE9LLgotICAgICAgICBicmVhazsKLQotICAgIGNhc2UgSWRlbnRpdHk6Ci0gICAgICAgIC8v IE5vIGJhY2tlbmQgaGFuZGxlcyB0aGlzIGJlY2F1c2UgaXQgd2lsbCBiZSBvcHRpbWl6ZWQgb3V0 LiBCdXQgd2UgbWF5IGNoZWNrCi0gICAgICAgIC8vIGZvciBjYXBhYmlsaXRpZXMgYmVmb3JlIG9w dGltaXphdGlvbi4gSXQgd291bGQgYmUgYSBkZWVwIGVycm9yIHRvIHJlbW92ZSB0aGlzCi0gICAg ICAgIC8vIGNhc2UgYmVjYXVzZSBpdCB3b3VsZCBwcmV2ZW50IHVzIGZyb20gY2F0Y2hpbmcgYnVn cyB3aGVyZSB0aGUgRlRMIGJhY2tlbmQKLSAgICAgICAgLy8gcGlwZWxpbmUgZmFpbGVkIHRvIG9w dGltaXplIG91dCBhbiBJZGVudGl0eS4KLSAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDaGVja0Fy cmF5OgotICAgICAgICBzd2l0Y2ggKG5vZGUtPmFycmF5TW9kZSgpLnR5cGUoKSkgewotICAgICAg ICBjYXNlIEFycmF5OjpJbnQzMjoKLSAgICAgICAgY2FzZSBBcnJheTo6RG91YmxlOgotICAgICAg ICBjYXNlIEFycmF5OjpDb250aWd1b3VzOgotICAgICAgICBjYXNlIEFycmF5OjpVbmRlY2lkZWQ6 Ci0gICAgICAgIGNhc2UgQXJyYXk6OkFycmF5U3RvcmFnZToKLSAgICAgICAgY2FzZSBBcnJheTo6 U2xvd1B1dEFycmF5U3RvcmFnZToKLSAgICAgICAgY2FzZSBBcnJheTo6RGlyZWN0QXJndW1lbnRz OgotICAgICAgICBjYXNlIEFycmF5OjpTY29wZWRBcmd1bWVudHM6Ci0gICAgICAgICAgICBicmVh azsKLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIGlmIChpc1R5cGVkVmlldyhub2RlLT5h cnJheU1vZGUoKS50eXBlZEFycmF5VHlwZSgpKSkKLSAgICAgICAgICAgICAgICBicmVhazsKLSAg ICAgICAgICAgIHJldHVybiBDYW5ub3RDb21waWxlOwotICAgICAgICB9Ci0gICAgICAgIGJyZWFr OwogICAgIGNhc2UgR2V0QXJyYXlMZW5ndGg6Ci0gICAgICAgIHN3aXRjaCAobm9kZS0+YXJyYXlN b2RlKCkudHlwZSgpKSB7Ci0gICAgICAgIGNhc2UgQXJyYXk6OlVuZGVjaWRlZDoKLSAgICAgICAg Y2FzZSBBcnJheTo6SW50MzI6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkRvdWJsZToKLSAgICAgICAg Y2FzZSBBcnJheTo6Q29udGlndW91czoKLSAgICAgICAgY2FzZSBBcnJheTo6QXJyYXlTdG9yYWdl OgotICAgICAgICBjYXNlIEFycmF5OjpTbG93UHV0QXJyYXlTdG9yYWdlOgotICAgICAgICBjYXNl IEFycmF5OjpTdHJpbmc6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkRpcmVjdEFyZ3VtZW50czoKLSAg ICAgICAgY2FzZSBBcnJheTo6U2NvcGVkQXJndW1lbnRzOgotICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBpZiAobm9kZS0+YXJyYXlNb2RlKCkuaXNTb21l VHlwZWRBcnJheVZpZXcoKSkKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIHJl dHVybiBDYW5ub3RDb21waWxlOwotICAgICAgICB9Ci0gICAgICAgIGJyZWFrOwogICAgIGNhc2Ug R2V0VmVjdG9yTGVuZ3RoOgotICAgICAgICBzd2l0Y2ggKG5vZGUtPmFycmF5TW9kZSgpLnR5cGUo KSkgewotICAgICAgICBjYXNlIEFycmF5OjpBcnJheVN0b3JhZ2U6Ci0gICAgICAgIGNhc2UgQXJy YXk6OlNsb3dQdXRBcnJheVN0b3JhZ2U6Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgZGVm YXVsdDoKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAg IH0KLSAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBHZXRCeVZhbDoKLSAgICAgICAgc3dpdGNoIChu b2RlLT5hcnJheU1vZGUoKS50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBBcnJheTo6Rm9yY2VFeGl0 OgotICAgICAgICBjYXNlIEFycmF5OjpHZW5lcmljOgotICAgICAgICBjYXNlIEFycmF5OjpTdHJp bmc6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkludDMyOgotICAgICAgICBjYXNlIEFycmF5OjpEb3Vi bGU6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkNvbnRpZ3VvdXM6Ci0gICAgICAgIGNhc2UgQXJyYXk6 OlVuZGVjaWRlZDoKLSAgICAgICAgY2FzZSBBcnJheTo6RGlyZWN0QXJndW1lbnRzOgotICAgICAg ICBjYXNlIEFycmF5OjpTY29wZWRBcmd1bWVudHM6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkFycmF5 U3RvcmFnZToKLSAgICAgICAgY2FzZSBBcnJheTo6U2xvd1B1dEFycmF5U3RvcmFnZToKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgaWYgKGlzVHlwZWRW aWV3KG5vZGUtPmFycmF5TW9kZSgpLnR5cGVkQXJyYXlUeXBlKCkpKQotICAgICAgICAgICAgICAg IHJldHVybiBDYW5Db21waWxlQW5kT1NSRW50ZXI7Ci0gICAgICAgICAgICByZXR1cm4gQ2Fubm90 Q29tcGlsZTsKLSAgICAgICAgfQotICAgICAgICBicmVhazsKICAgICBjYXNlIEdldEJ5VmFsV2l0 aFRoaXM6Ci0gICAgICAgIGJyZWFrOwogICAgIGNhc2UgUHV0QnlWYWw6CiAgICAgY2FzZSBQdXRC eVZhbEFsaWFzOgogICAgIGNhc2UgUHV0QnlWYWxEaXJlY3Q6Ci0gICAgICAgIHN3aXRjaCAobm9k ZS0+YXJyYXlNb2RlKCkudHlwZSgpKSB7Ci0gICAgICAgIGNhc2UgQXJyYXk6OkZvcmNlRXhpdDoK LSAgICAgICAgY2FzZSBBcnJheTo6R2VuZXJpYzoKLSAgICAgICAgY2FzZSBBcnJheTo6SW50MzI6 Ci0gICAgICAgIGNhc2UgQXJyYXk6OkRvdWJsZToKLSAgICAgICAgY2FzZSBBcnJheTo6Q29udGln dW91czoKLSAgICAgICAgY2FzZSBBcnJheTo6QXJyYXlTdG9yYWdlOgotICAgICAgICBjYXNlIEFy cmF5OjpTbG93UHV0QXJyYXlTdG9yYWdlOgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRl ZmF1bHQ6Ci0gICAgICAgICAgICBpZiAoaXNUeXBlZFZpZXcobm9kZS0+YXJyYXlNb2RlKCkudHlw ZWRBcnJheVR5cGUoKSkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIENhbkNvbXBpbGVBbmRPU1JF bnRlcjsKLSAgICAgICAgICAgIHJldHVybiBDYW5ub3RDb21waWxlOwotICAgICAgICB9Ci0gICAg ICAgIGJyZWFrOwogICAgIGNhc2UgUHV0QnlWYWxXaXRoVGhpczoKKyAgICAgICAgLy8gVGhlc2Ug YXJlIE9LLgogICAgICAgICBicmVhazsKLSAgICBkZWZhdWx0OgotICAgICAgICAvLyBEb24ndCBr bm93IGhvdyB0byBoYW5kbGUgYW55dGhpbmcgZWxzZS4KKworICAgIGNhc2UgSWRlbnRpdHk6Cisg ICAgICAgIC8vIE5vIGJhY2tlbmQgaGFuZGxlcyB0aGlzIGJlY2F1c2UgaXQgd2lsbCBiZSBvcHRp bWl6ZWQgb3V0LiBCdXQgd2UgbWF5IGNoZWNrCisgICAgICAgIC8vIGZvciBjYXBhYmlsaXRpZXMg YmVmb3JlIG9wdGltaXphdGlvbi4gSXQgd291bGQgYmUgYSBkZWVwIGVycm9yIHRvIHJlbW92ZSB0 aGlzCisgICAgICAgIC8vIGNhc2UgYmVjYXVzZSBpdCB3b3VsZCBwcmV2ZW50IHVzIGZyb20gY2F0 Y2hpbmcgYnVncyB3aGVyZSB0aGUgRlRMIGJhY2tlbmQKKyAgICAgICAgLy8gcGlwZWxpbmUgZmFp bGVkIHRvIG9wdGltaXplIG91dCBhbiBJZGVudGl0eS4KKyAgICAgICAgYnJlYWs7CisKKyAgICBj YXNlIElkZW50aXR5V2l0aFByb2ZpbGU6CisgICAgY2FzZSBDcmVhdGVUaGlzOgorICAgIGNhc2Ug Q2hlY2tUaWVyVXBJbkxvb3A6CisgICAgY2FzZSBDaGVja1RpZXJVcEFuZE9TUkVudGVyOgorICAg IGNhc2UgQ2hlY2tUaWVyVXBBdFJldHVybjoKKyAgICBjYXNlIEZpYXRJbnQ1MjoKKyAgICBjYXNl IEFyaXRoSU11bDoKKyAgICBjYXNlIFByb2ZpbGVUeXBlOgorICAgIGNhc2UgUHJvZmlsZUNvbnRy b2xGbG93OgorICAgIGNhc2UgTGFzdE5vZGVUeXBlOgogICAgICAgICByZXR1cm4gQ2Fubm90Q29t cGlsZTsKICAgICB9CiAgICAgcmV0dXJuIENhbkNvbXBpbGVBbmRPU1JFbnRlcjsK 336283 2018-03-22 07:59:31 -0700 2018-03-22 07:59:31 -0700 Patch for landing bug-183897-20180322235930.patch text/plain 11941 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5ODQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZWE4YTAwMjYxZjkyZTY5MjQ3NTM3NjRkMzk5ZDY2Zjc2YjlhN2E1Li43MzAyZmFhMTk2MWExMDkw ZDIxODdmODQ3ZWY1NDAxMWM2YjEwOGYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxOC0wMy0yMiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KKworICAgICAgICBbSlNDXSBMaXN0IHVwIGFsbCBjYW5kaWRhdGVzIGluIERGR0NhcGFi aWxpdGllcyBhbmQgRlRMQ2FwYWJpbGl0aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODM4OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZSBzaG91bGQgbm90IHVzZSBgZGVmYXVsdDpgIGNsYXVzZSBo ZXJlIHNpbmNlIGl0IGFjY2lkZW50YWxseSBjYXRjaGVzCisgICAgICAgIHRoZSBvcGNvZGUgYW5k IERGRyBub2RlcyB3aGljaCBzaG91bGQgYmUgb3B0aW1pemVkLiBGb3IgZXhhbXBsZSwKKyAgICAg ICAgb3Bfc3VwZXJfc2FtcGxlcl9iZWdpbiBhbmQgb3Bfc3VwZXJfc2FtcGxlcl9lbmQgYXJlIG5v dCBsaXN0ZWQgd2hpbGUKKyAgICAgICAgdGhleSBoYXZlIERGRyBhbmQgRlRMIGJhY2tlbmQuCisK KyAgICAgICAgVGhpcyBwYXRjaCBsaXN0cyB1cCBhbGwgY2FuZGlhdGVzIGluIERGR0NhcGFiaWxp dGllcyBhbmQgRlRMQ2FwYWJpbGl0aWVzLgorICAgICAgICBBbmQgd2UgYWxzbyBjbGVhbiB1cCB1 bm5lY2Vzc2FyeSBjaGVja3MgaW4gRlRMQ2FwYWJpbGl0aWVzLiBTaW5jZSB3ZQorICAgICAgICBh bHJlYWR5IGhhbmRsZXMgYWxsIHRoZSBwb3NzaWJsZSBhcnJheSB0eXBlcyBmb3IgdGhlc2Ugbm9k ZXMgKHdoaWNoIGNhbgorICAgICAgICBiZSBjaGVja2VkIGluIERGRydzIGNvZGUpLCB3ZSBkbyBu b3QgbmVlZCB0byBjaGVjayBhcnJheSB0eXBlcy4KKworICAgICAgICBXZSBhbHNvIGZpeCBGVExM b3dlckRGR1RvQjMnIFB1dEJ5VmFsIGNvZGUgdG8gdXNlIG1vZGVGb3JQdXQuCisKKyAgICAgICAg KiBkZmcvREZHQ2FwYWJpbGl0aWVzLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpjYXBhYmlsaXR5 TGV2ZWwpOgorICAgICAgICAqIGZ0bC9GVExDYXBhYmlsaXRpZXMuY3BwOgorICAgICAgICAoSlND OjpGVEw6OmNhbkNvbXBpbGUpOgorICAgICAgICAqIGZ0bC9GVExMb3dlckRGR1RvQjMuY3BwOgor ICAgICAgICAoSlNDOjpGVEw6OkRGRzo6TG93ZXJERkdUb0IzOjpjb21waWxlUHV0QnlWYWwpOgor CiAyMDE4LTAzLTIxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAg U2NvcGVkQXJndW1lbnRzIHNob3VsZCBkbyBwb2lzb25pbmcgYW5kIGluZGV4IG1hc2tpbmcKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2FwYWJpbGl0aWVzLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ2FwYWJpbGl0aWVzLmNwcAppbmRleCBkNTY3 MDliNzE5YmFmM2RjZTlkMmZjMGVlMmU5YWI4ODcxOGQ3YzQ0Li41OWQ4NWMzMTY0NjBiNWUzNWI1 NGRmNWExOGRmNWYxOTdhNmVhMDc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0NhcGFiaWxpdGllcy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdDYXBhYmlsaXRpZXMuY3BwCkBAIC0yNjUsMTUgKzI2NSwzNCBAQCBDYXBhYmlsaXR5TGV2ZWwg Y2FwYWJpbGl0eUxldmVsKE9wY29kZUlEIG9wY29kZUlELCBDb2RlQmxvY2sqIGNvZGVCbG9jaywg SW5zdHJ1YwogICAgIGNhc2Ugb3BfcmVzb2x2ZV9zY29wZV9mb3JfaG9pc3RpbmdfZnVuY19kZWNs X2luX2V2YWw6CiAgICAgY2FzZSBvcF9uZXdfcmVnZXhwOgogICAgIGNhc2Ugb3BfdW5yZWFjaGFi bGU6CisgICAgY2FzZSBvcF9zdXBlcl9zYW1wbGVyX2JlZ2luOgorICAgIGNhc2Ugb3Bfc3VwZXJf c2FtcGxlcl9lbmQ6CiAgICAgICAgIHJldHVybiBDYW5Db21waWxlQW5kSW5saW5lOwogCiAgICAg Y2FzZSBvcF9zd2l0Y2hfc3RyaW5nOiAvLyBEb24ndCBpbmxpbmUgYmVjYXVzZSB3ZSBkb24ndCB3 YW50IHRvIGNvcHkgc3RyaW5nIHRhYmxlcyBpbiB0aGUgY29uY3VycmVudCBKSVQuCiAgICAgY2Fz ZSBvcF9jYWxsX2V2YWw6CiAgICAgICAgIHJldHVybiBDYW5Db21waWxlOwogCi0gICAgZGVmYXVs dDoKKyAgICBjYXNlIG9wX3B1dF9ieV9pbmRleDoKKyAgICBjYXNlIG9wX3lpZWxkOgorICAgIGNh c2UgbGxpbnRfcHJvZ3JhbV9wcm9sb2d1ZToKKyAgICBjYXNlIGxsaW50X2V2YWxfcHJvbG9ndWU6 CisgICAgY2FzZSBsbGludF9tb2R1bGVfcHJvZ3JhbV9wcm9sb2d1ZToKKyAgICBjYXNlIGxsaW50 X2Z1bmN0aW9uX2Zvcl9jYWxsX3Byb2xvZ3VlOgorICAgIGNhc2UgbGxpbnRfZnVuY3Rpb25fZm9y X2NvbnN0cnVjdF9wcm9sb2d1ZToKKyAgICBjYXNlIGxsaW50X2Z1bmN0aW9uX2Zvcl9jYWxsX2Fy aXR5X2NoZWNrOgorICAgIGNhc2UgbGxpbnRfZnVuY3Rpb25fZm9yX2NvbnN0cnVjdF9hcml0eV9j aGVjazoKKyAgICBjYXNlIGxsaW50X2dlbmVyaWNfcmV0dXJuX3BvaW50OgorICAgIGNhc2UgbGxp bnRfdGhyb3dfZnJvbV9zbG93X3BhdGhfdHJhbXBvbGluZToKKyAgICBjYXNlIGxsaW50X3Rocm93 X2R1cmluZ19jYWxsX3RyYW1wb2xpbmU6CisgICAgY2FzZSBsbGludF9uYXRpdmVfY2FsbF90cmFt cG9saW5lOgorICAgIGNhc2UgbGxpbnRfbmF0aXZlX2NvbnN0cnVjdF90cmFtcG9saW5lOgorICAg IGNhc2UgbGxpbnRfaW50ZXJuYWxfZnVuY3Rpb25fY2FsbF90cmFtcG9saW5lOgorICAgIGNhc2Ug bGxpbnRfaW50ZXJuYWxfZnVuY3Rpb25fY29uc3RydWN0X3RyYW1wb2xpbmU6CisgICAgY2FzZSBo YW5kbGVVbmNhdWdodEV4Y2VwdGlvbjoKICAgICAgICAgcmV0dXJuIENhbm5vdENvbXBpbGU7CiAg ICAgfQorICAgIHJldHVybiBDYW5ub3RDb21waWxlOwogfQogCiBDYXBhYmlsaXR5TGV2ZWwgY2Fw YWJpbGl0eUxldmVsKENvZGVCbG9jayogY29kZUJsb2NrKQpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExDYXBhYmlsaXRpZXMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2Z0bC9GVExDYXBhYmlsaXRpZXMuY3BwCmluZGV4IDc1NGExZTYxNjIwN2ViMGNjOWU0NDFj MTJmZDc1YjU0NzJmZGMxYzguLjdjMjcxNzk3Njg4OTY5MGVlOGQ2MjAwNjYwZTJlZTY2ZjA2MzUw M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMQ2FwYWJpbGl0aWVz LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTENhcGFiaWxpdGllcy5jcHAK QEAgLTE3NSw2ICsxNzUsNyBAQCBpbmxpbmUgQ2FwYWJpbGl0eUxldmVsIGNhbkNvbXBpbGUoTm9k ZSogbm9kZSkKICAgICBjYXNlIENvbnN0YW50U3RvcmFnZVBvaW50ZXI6CiAgICAgY2FzZSBDaGVj azoKICAgICBjYXNlIENoZWNrVmFyYXJnczoKKyAgICBjYXNlIENoZWNrQXJyYXk6CiAgICAgY2Fz ZSBDb3VudEV4ZWN1dGlvbjoKICAgICBjYXNlIFN1cGVyU2FtcGxlckJlZ2luOgogICAgIGNhc2Ug U3VwZXJTYW1wbGVyRW5kOgpAQCAtMzM3LDEwMyArMzM4LDM0IEBAIGlubGluZSBDYXBhYmlsaXR5 TGV2ZWwgY2FuQ29tcGlsZShOb2RlKiBub2RlKQogICAgIGNhc2UgSW5pdGlhbGl6ZUVudHJ5cG9p bnRBcmd1bWVudHM6CiAgICAgY2FzZSBDUFVJbnRyaW5zaWM6CiAgICAgY2FzZSBHZXRBcnJheU1h c2s6Ci0gICAgICAgIC8vIFRoZXNlIGFyZSBPSy4KLSAgICAgICAgYnJlYWs7Ci0KLSAgICBjYXNl IElkZW50aXR5OgotICAgICAgICAvLyBObyBiYWNrZW5kIGhhbmRsZXMgdGhpcyBiZWNhdXNlIGl0 IHdpbGwgYmUgb3B0aW1pemVkIG91dC4gQnV0IHdlIG1heSBjaGVjawotICAgICAgICAvLyBmb3Ig Y2FwYWJpbGl0aWVzIGJlZm9yZSBvcHRpbWl6YXRpb24uIEl0IHdvdWxkIGJlIGEgZGVlcCBlcnJv ciB0byByZW1vdmUgdGhpcwotICAgICAgICAvLyBjYXNlIGJlY2F1c2UgaXQgd291bGQgcHJldmVu dCB1cyBmcm9tIGNhdGNoaW5nIGJ1Z3Mgd2hlcmUgdGhlIEZUTCBiYWNrZW5kCi0gICAgICAgIC8v IHBpcGVsaW5lIGZhaWxlZCB0byBvcHRpbWl6ZSBvdXQgYW4gSWRlbnRpdHkuCi0gICAgICAgIGJy ZWFrOwotICAgIGNhc2UgQ2hlY2tBcnJheToKLSAgICAgICAgc3dpdGNoIChub2RlLT5hcnJheU1v ZGUoKS50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBBcnJheTo6SW50MzI6Ci0gICAgICAgIGNhc2Ug QXJyYXk6OkRvdWJsZToKLSAgICAgICAgY2FzZSBBcnJheTo6Q29udGlndW91czoKLSAgICAgICAg Y2FzZSBBcnJheTo6VW5kZWNpZGVkOgotICAgICAgICBjYXNlIEFycmF5OjpBcnJheVN0b3JhZ2U6 Ci0gICAgICAgIGNhc2UgQXJyYXk6OlNsb3dQdXRBcnJheVN0b3JhZ2U6Ci0gICAgICAgIGNhc2Ug QXJyYXk6OkRpcmVjdEFyZ3VtZW50czoKLSAgICAgICAgY2FzZSBBcnJheTo6U2NvcGVkQXJndW1l bnRzOgotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBp ZiAoaXNUeXBlZFZpZXcobm9kZS0+YXJyYXlNb2RlKCkudHlwZWRBcnJheVR5cGUoKSkpCi0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICByZXR1cm4gQ2Fubm90Q29tcGlsZTsKLSAg ICAgICAgfQotICAgICAgICBicmVhazsKICAgICBjYXNlIEdldEFycmF5TGVuZ3RoOgotICAgICAg ICBzd2l0Y2ggKG5vZGUtPmFycmF5TW9kZSgpLnR5cGUoKSkgewotICAgICAgICBjYXNlIEFycmF5 OjpVbmRlY2lkZWQ6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkludDMyOgotICAgICAgICBjYXNlIEFy cmF5OjpEb3VibGU6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkNvbnRpZ3VvdXM6Ci0gICAgICAgIGNh c2UgQXJyYXk6OkFycmF5U3RvcmFnZToKLSAgICAgICAgY2FzZSBBcnJheTo6U2xvd1B1dEFycmF5 U3RvcmFnZToKLSAgICAgICAgY2FzZSBBcnJheTo6U3RyaW5nOgotICAgICAgICBjYXNlIEFycmF5 OjpEaXJlY3RBcmd1bWVudHM6Ci0gICAgICAgIGNhc2UgQXJyYXk6OlNjb3BlZEFyZ3VtZW50czoK LSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgaWYgKG5v ZGUtPmFycmF5TW9kZSgpLmlzU29tZVR5cGVkQXJyYXlWaWV3KCkpCi0gICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICByZXR1cm4gQ2Fubm90Q29tcGlsZTsKLSAgICAgICAgfQotICAg ICAgICBicmVhazsKICAgICBjYXNlIEdldFZlY3Rvckxlbmd0aDoKLSAgICAgICAgc3dpdGNoIChu b2RlLT5hcnJheU1vZGUoKS50eXBlKCkpIHsKLSAgICAgICAgY2FzZSBBcnJheTo6QXJyYXlTdG9y YWdlOgotICAgICAgICBjYXNlIEFycmF5OjpTbG93UHV0QXJyYXlTdG9yYWdlOgotICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9O T1RfUkVBQ0hFRCgpOwotICAgICAgICB9Ci0gICAgICAgIGJyZWFrOwogICAgIGNhc2UgR2V0QnlW YWw6Ci0gICAgICAgIHN3aXRjaCAobm9kZS0+YXJyYXlNb2RlKCkudHlwZSgpKSB7Ci0gICAgICAg IGNhc2UgQXJyYXk6OkZvcmNlRXhpdDoKLSAgICAgICAgY2FzZSBBcnJheTo6R2VuZXJpYzoKLSAg ICAgICAgY2FzZSBBcnJheTo6U3RyaW5nOgotICAgICAgICBjYXNlIEFycmF5OjpJbnQzMjoKLSAg ICAgICAgY2FzZSBBcnJheTo6RG91YmxlOgotICAgICAgICBjYXNlIEFycmF5OjpDb250aWd1b3Vz OgotICAgICAgICBjYXNlIEFycmF5OjpVbmRlY2lkZWQ6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkRp cmVjdEFyZ3VtZW50czoKLSAgICAgICAgY2FzZSBBcnJheTo6U2NvcGVkQXJndW1lbnRzOgotICAg ICAgICBjYXNlIEFycmF5OjpBcnJheVN0b3JhZ2U6Ci0gICAgICAgIGNhc2UgQXJyYXk6OlNsb3dQ dXRBcnJheVN0b3JhZ2U6Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgZGVmYXVsdDoKLSAg ICAgICAgICAgIGlmIChpc1R5cGVkVmlldyhub2RlLT5hcnJheU1vZGUoKS50eXBlZEFycmF5VHlw ZSgpKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gQ2FuQ29tcGlsZUFuZE9TUkVudGVyOwotICAg ICAgICAgICAgcmV0dXJuIENhbm5vdENvbXBpbGU7Ci0gICAgICAgIH0KLSAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBHZXRCeVZhbFdpdGhUaGlzOgotICAgICAgICBicmVhazsKICAgICBjYXNlIFB1 dEJ5VmFsOgogICAgIGNhc2UgUHV0QnlWYWxBbGlhczoKICAgICBjYXNlIFB1dEJ5VmFsRGlyZWN0 OgotICAgICAgICBzd2l0Y2ggKG5vZGUtPmFycmF5TW9kZSgpLnR5cGUoKSkgewotICAgICAgICBj YXNlIEFycmF5OjpGb3JjZUV4aXQ6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkdlbmVyaWM6Ci0gICAg ICAgIGNhc2UgQXJyYXk6OkludDMyOgotICAgICAgICBjYXNlIEFycmF5OjpEb3VibGU6Ci0gICAg ICAgIGNhc2UgQXJyYXk6OkNvbnRpZ3VvdXM6Ci0gICAgICAgIGNhc2UgQXJyYXk6OkFycmF5U3Rv cmFnZToKLSAgICAgICAgY2FzZSBBcnJheTo6U2xvd1B1dEFycmF5U3RvcmFnZToKLSAgICAgICAg ICAgIGJyZWFrOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgaWYgKGlzVHlwZWRWaWV3 KG5vZGUtPmFycmF5TW9kZSgpLnR5cGVkQXJyYXlUeXBlKCkpKQotICAgICAgICAgICAgICAgIHJl dHVybiBDYW5Db21waWxlQW5kT1NSRW50ZXI7Ci0gICAgICAgICAgICByZXR1cm4gQ2Fubm90Q29t cGlsZTsKLSAgICAgICAgfQotICAgICAgICBicmVhazsKICAgICBjYXNlIFB1dEJ5VmFsV2l0aFRo aXM6CisgICAgICAgIC8vIFRoZXNlIGFyZSBPSy4KICAgICAgICAgYnJlYWs7Ci0gICAgZGVmYXVs dDoKLSAgICAgICAgLy8gRG9uJ3Qga25vdyBob3cgdG8gaGFuZGxlIGFueXRoaW5nIGVsc2UuCisK KyAgICBjYXNlIElkZW50aXR5OgorICAgICAgICAvLyBObyBiYWNrZW5kIGhhbmRsZXMgdGhpcyBi ZWNhdXNlIGl0IHdpbGwgYmUgb3B0aW1pemVkIG91dC4gQnV0IHdlIG1heSBjaGVjaworICAgICAg ICAvLyBmb3IgY2FwYWJpbGl0aWVzIGJlZm9yZSBvcHRpbWl6YXRpb24uIEl0IHdvdWxkIGJlIGEg ZGVlcCBlcnJvciB0byByZW1vdmUgdGhpcworICAgICAgICAvLyBjYXNlIGJlY2F1c2UgaXQgd291 bGQgcHJldmVudCB1cyBmcm9tIGNhdGNoaW5nIGJ1Z3Mgd2hlcmUgdGhlIEZUTCBiYWNrZW5kCisg ICAgICAgIC8vIHBpcGVsaW5lIGZhaWxlZCB0byBvcHRpbWl6ZSBvdXQgYW4gSWRlbnRpdHkuCisg ICAgICAgIGJyZWFrOworCisgICAgY2FzZSBJZGVudGl0eVdpdGhQcm9maWxlOgorICAgIGNhc2Ug Q3JlYXRlVGhpczoKKyAgICBjYXNlIENoZWNrVGllclVwSW5Mb29wOgorICAgIGNhc2UgQ2hlY2tU aWVyVXBBbmRPU1JFbnRlcjoKKyAgICBjYXNlIENoZWNrVGllclVwQXRSZXR1cm46CisgICAgY2Fz ZSBGaWF0SW50NTI6CisgICAgY2FzZSBBcml0aElNdWw6CisgICAgY2FzZSBQcm9maWxlVHlwZToK KyAgICBjYXNlIFByb2ZpbGVDb250cm9sRmxvdzoKKyAgICBjYXNlIExhc3ROb2RlVHlwZToKICAg ICAgICAgcmV0dXJuIENhbm5vdENvbXBpbGU7CiAgICAgfQogICAgIHJldHVybiBDYW5Db21waWxl QW5kT1NSRW50ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExv d2VyREZHVG9CMy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9C My5jcHAKaW5kZXggMDJkYmE2NzhlZTQ4MzM3YWE2YzMxNGU3NmQ5ZjI3YzljZTM4ZThkOC4uNjk4 MjI5YTRhOTE4NzE5OTc4YzhlMDNiMTc4YWQxYjAxNmY2MDhlZCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcApAQCAtNDEyOSw3ICs0MTI5LDggQEAg Y2xhc3MgTG93ZXJERkdUb0IzIHsKICAgICAgICAgRWRnZSBjaGlsZDQgPSBtX2dyYXBoLnZhckFy Z0NoaWxkKG1fbm9kZSwgMyk7CiAgICAgICAgIEVkZ2UgY2hpbGQ1ID0gbV9ncmFwaC52YXJBcmdD aGlsZChtX25vZGUsIDQpOwogICAgICAgICAKLSAgICAgICAgc3dpdGNoIChtX25vZGUtPmFycmF5 TW9kZSgpLnR5cGUoKSkgeworICAgICAgICBBcnJheU1vZGUgYXJyYXlNb2RlID0gbV9ub2RlLT5h cnJheU1vZGUoKS5tb2RlRm9yUHV0KCk7CisgICAgICAgIHN3aXRjaCAoYXJyYXlNb2RlLnR5cGUo KSkgewogICAgICAgICBjYXNlIEFycmF5OjpHZW5lcmljOiB7CiAgICAgICAgICAgICBpZiAoY2hp bGQxLnVzZUtpbmQoKSA9PSBDZWxsVXNlKSB7CiAgICAgICAgICAgICAgICAgVl9KSVRPcGVyYXRp b25fRUNDSiBvcGVyYXRpb24gPSBudWxscHRyOwpAQCAtNDE5MywyMyArNDE5NCwyMyBAQCBjbGFz cyBMb3dlckRGR1RvQjMgewogICAgICAgICBMVmFsdWUgaW5kZXggPSBsb3dJbnQzMihjaGlsZDIp OwogICAgICAgICBMVmFsdWUgc3RvcmFnZSA9IGxvd1N0b3JhZ2UoY2hpbGQ0KTsKICAgICAgICAg Ci0gICAgICAgIHN3aXRjaCAobV9ub2RlLT5hcnJheU1vZGUoKS50eXBlKCkpIHsKKyAgICAgICAg c3dpdGNoIChhcnJheU1vZGUudHlwZSgpKSB7CiAgICAgICAgIGNhc2UgQXJyYXk6OkludDMyOgog ICAgICAgICBjYXNlIEFycmF5OjpEb3VibGU6CiAgICAgICAgIGNhc2UgQXJyYXk6OkNvbnRpZ3Vv dXM6IHsKICAgICAgICAgICAgIExCYXNpY0Jsb2NrIGNvbnRpbnVhdGlvbiA9IG1fb3V0Lm5ld0Js b2NrKCk7CiAgICAgICAgICAgICBMQmFzaWNCbG9jayBvdXRlckxhc3ROZXh0ID0gbV9vdXQuYXBw ZW5kVG8obV9vdXQubV9ibG9jaywgY29udGludWF0aW9uKTsKICAgICAgICAgICAgIAotICAgICAg ICAgICAgc3dpdGNoIChtX25vZGUtPmFycmF5TW9kZSgpLnR5cGUoKSkgeworICAgICAgICAgICAg c3dpdGNoIChhcnJheU1vZGUudHlwZSgpKSB7CiAgICAgICAgICAgICBjYXNlIEFycmF5OjpJbnQz MjoKICAgICAgICAgICAgIGNhc2UgQXJyYXk6OkNvbnRpZ3VvdXM6IHsKICAgICAgICAgICAgICAg ICBMVmFsdWUgdmFsdWUgPSBsb3dKU1ZhbHVlKGNoaWxkMywgTWFudWFsT3BlcmFuZFNwZWN1bGF0 aW9uKTsKICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAgICAgICBpZiAobV9ub2RlLT5hcnJh eU1vZGUoKS50eXBlKCkgPT0gQXJyYXk6OkludDMyKQorICAgICAgICAgICAgICAgIGlmIChhcnJh eU1vZGUudHlwZSgpID09IEFycmF5OjpJbnQzMikKICAgICAgICAgICAgICAgICAgICAgRlRMX1RZ UEVfQ0hFQ0soanNWYWx1ZVZhbHVlKHZhbHVlKSwgY2hpbGQzLCBTcGVjSW50MzJPbmx5LCBpc05v dEludDMyKHZhbHVlKSk7CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgVHlwZWRQ b2ludGVyIGVsZW1lbnRQb2ludGVyID0gbV9vdXQuYmFzZUluZGV4KAotICAgICAgICAgICAgICAg ICAgICBtX25vZGUtPmFycmF5TW9kZSgpLnR5cGUoKSA9PSBBcnJheTo6SW50MzIgPworICAgICAg ICAgICAgICAgICAgICBhcnJheU1vZGUudHlwZSgpID09IEFycmF5OjpJbnQzMiA/CiAgICAgICAg ICAgICAgICAgICAgIG1faGVhcHMuaW5kZXhlZEludDMyUHJvcGVydGllcyA6IG1faGVhcHMuaW5k ZXhlZENvbnRpZ3VvdXNQcm9wZXJ0aWVzLAogICAgICAgICAgICAgICAgICAgICBzdG9yYWdlLCBt X291dC56ZXJvRXh0UHRyKGluZGV4KSwgcHJvdmVuVmFsdWUoY2hpbGQyKSk7CiAgICAgICAgICAg ICAgICAgCkBAIC00Mjc2LDcgKzQyNzcsNyBAQCBjbGFzcyBMb3dlckRGR1RvQjMgewogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKG1fbm9k ZS0+YXJyYXlNb2RlKCkuaXNJbkJvdW5kcygpKSB7CisgICAgICAgICAgICBpZiAoYXJyYXlNb2Rl LmlzSW5Cb3VuZHMoKSkgewogICAgICAgICAgICAgICAgIHNwZWN1bGF0ZShTdG9yZVRvSG9sZSwg bm9WYWx1ZSgpLCAwLCBtX291dC5pc1plcm82NChtX291dC5sb2FkNjQoZWxlbWVudFBvaW50ZXIp KSk7CiAgICAgICAgICAgICAgICAgbV9vdXQuc3RvcmU2NCh2YWx1ZSwgZWxlbWVudFBvaW50ZXIp OwogICAgICAgICAgICAgICAgIHJldHVybjsKQEAgLTQyODgsNyArNDI4OSw3IEBAIGNsYXNzIExv d2VyREZHVG9CMyB7CiAgICAgICAgICAgICBhdXRvIHNsb3dQYXRoRnVuY3Rpb24gPSBjb2RlQmxv Y2soKS0+aXNTdHJpY3RNb2RlKCkKICAgICAgICAgICAgICAgICA/IChtX25vZGUtPm9wKCkgPT0g UHV0QnlWYWxEaXJlY3QgPyBvcGVyYXRpb25QdXRCeVZhbERpcmVjdEJleW9uZEFycmF5Qm91bmRz U3RyaWN0IDogb3BlcmF0aW9uUHV0QnlWYWxCZXlvbmRBcnJheUJvdW5kc1N0cmljdCkKICAgICAg ICAgICAgICAgICA6IChtX25vZGUtPm9wKCkgPT0gUHV0QnlWYWxEaXJlY3QgPyBvcGVyYXRpb25Q dXRCeVZhbERpcmVjdEJleW9uZEFycmF5Qm91bmRzTm9uU3RyaWN0IDogb3BlcmF0aW9uUHV0QnlW YWxCZXlvbmRBcnJheUJvdW5kc05vblN0cmljdCk7Ci0gICAgICAgICAgICBpZiAoIW1fbm9kZS0+ YXJyYXlNb2RlKCkuaXNPdXRPZkJvdW5kcygpKSB7CisgICAgICAgICAgICBpZiAoIWFycmF5TW9k ZS5pc091dE9mQm91bmRzKCkpIHsKICAgICAgICAgICAgICAgICBzcGVjdWxhdGUoT3V0T2ZCb3Vu ZHMsIG5vVmFsdWUoKSwgMCwgaXNPdXRPZkJvdW5kcyk7CiAgICAgICAgICAgICAgICAgaXNPdXRP ZkJvdW5kcyA9IG1fb3V0LmJvb2xlYW5GYWxzZTsKICAgICAgICAgICAgIH0KQEAgLTQzMDksNyAr NDMxMCw3IEBAIGNsYXNzIExvd2VyREZHVG9CMyB7CiAgICAgICAgICAgICBtX291dC5qdW1wKGNv bnRpbnVhdGlvbik7CiAKIAotICAgICAgICAgICAgaWYgKG1fbm9kZS0+YXJyYXlNb2RlKCkuaXNT bG93UHV0KCkpIHsKKyAgICAgICAgICAgIGlmIChhcnJheU1vZGUuaXNTbG93UHV0KCkpIHsKICAg ICAgICAgICAgICAgICBtX291dC5hcHBlbmRUbyhpbkJvdW5kQ2FzZSwgZG9TdG9yZUNhc2UpOwog ICAgICAgICAgICAgICAgIG1fb3V0LmJyYW5jaChtX291dC5pc1plcm82NChtX291dC5sb2FkNjQo ZWxlbWVudFBvaW50ZXIpKSwgcmFyZWx5KHNsb3dDYXNlKSwgdXN1YWxseShkb1N0b3JlQ2FzZSkp OwogICAgICAgICAgICAgfSBlbHNlIHsKQEAgLTQzNDEsNyArNDM0Miw3IEBAIGNsYXNzIExvd2Vy REZHVG9CMyB7CiAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICBkZWZhdWx0OiB7Ci0g ICAgICAgICAgICBUeXBlZEFycmF5VHlwZSB0eXBlID0gbV9ub2RlLT5hcnJheU1vZGUoKS50eXBl ZEFycmF5VHlwZSgpOworICAgICAgICAgICAgVHlwZWRBcnJheVR5cGUgdHlwZSA9IGFycmF5TW9k ZS50eXBlZEFycmF5VHlwZSgpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAoaXNUeXBl ZFZpZXcodHlwZSkpIHsKICAgICAgICAgICAgICAgICBUeXBlZFBvaW50ZXIgcG9pbnRlciA9IFR5 cGVkUG9pbnRlcigKQEAgLTQzNzIsNyArNDM3Myw3IEBAIGNsYXNzIExvd2VyREZHVG9CMyB7CiAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAg ICBpZiAobV9ub2RlLT5hcnJheU1vZGUoKS5pc0luQm91bmRzKCkgfHwgbV9ub2RlLT5vcCgpID09 IFB1dEJ5VmFsQWxpYXMpCisgICAgICAgICAgICAgICAgaWYgKGFycmF5TW9kZS5pc0luQm91bmRz KCkgfHwgbV9ub2RlLT5vcCgpID09IFB1dEJ5VmFsQWxpYXMpCiAgICAgICAgICAgICAgICAgICAg IG1fb3V0LnN0b3JlKHZhbHVlVG9TdG9yZSwgcG9pbnRlciwgc3RvcmVUeXBlKHR5cGUpKTsKICAg ICAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICAgICAgTEJhc2ljQmxvY2sgaXNJ bkJvdW5kcyA9IG1fb3V0Lm5ld0Jsb2NrKCk7Cg==