154508 2016-02-20 22:37:03 -0800 Web Inspector: it should be possible to omit generated code guarded by INSPECTOR_ALTERNATE_DISPATCHERS 2016-02-21 16:08:35 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg bburg commit-queue graouts joepeck keith_miller mark.lam mattbaker msaboff nvasilyev saam timothy webkit-bug-importer oldest_to_newest 1166807 0 bburg 2016-02-20 22:37:03 -0800 patch coming. 1166808 1 webkit-bug-importer 2016-02-20 22:37:19 -0800 <rdar://problem/24759077> 1166809 2 271876 bburg 2016-02-20 22:51:23 -0800 Created attachment 271876 Proposed Fix 1166810 3 commit-queue 2016-02-20 22:52:47 -0800 This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`) 1166811 4 commit-queue 2016-02-20 22:52:55 -0800 Attachment 271876 did not pass style-queue: ERROR: Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:70: [CppBackendDispatcherHeaderGenerator.generate_output] Instance of 'CppBackendDispatcherHeaderGenerator' has no 'model' member [pylint/E1101] [5] ERROR: Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:205: [CppBackendDispatcherHeaderGenerator._generate_dispatcher_declarations_for_domain] Instance of 'CppBackendDispatcherHeaderGenerator' has no 'model' member [pylint/E1101] [5] ERROR: Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:59: [CppBackendDispatcherImplementationGenerator.generate_output] Instance of 'CppBackendDispatcherImplementationGenerator' has no 'model' member [pylint/E1101] [5] ERROR: Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:281: [CppBackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command] Instance of 'CppBackendDispatcherImplementationGenerator' has no 'model' member [pylint/E1101] [5] Total errors found: 4 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 1166878 5 bburg 2016-02-21 16:08:35 -0800 Committed r196881: <http://trac.webkit.org/changeset/196881> 271876 2016-02-20 22:51:23 -0800 2016-02-21 14:36:42 -0800 Proposed Fix bug-154508-20160220225105.patch text/plain 21550 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi M2IyYzlhYTU1NWQ1YjIwNjc3MGI5YzY5MjQ4ZWE1ZjgzZjQ4ZDM1Li5lZjJjODdkMDQ3MDI3NTg4 Y2QxNTAxODU4MjA5Mjc3YTZlMWI3ZjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0OCBAQAogMjAxNi0wMi0yMCAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBpdCBzaG91bGQgYmUgcG9zc2libGUgdG8gb21pdCBnZW5l cmF0ZWQgY29kZSBndWFyZGVkIGJ5IElOU1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDUwOAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMjQ3NTkwNzc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gcHJlcGFyYXRpb24gZm9yIGJlaW5nIGFibGUgdG8g Z2VuZXJhdGUgcHJvdG9jb2wgZmlsZXMgZm9yIFdlYktpdDIsCisgICAgICAgIG1ha2UgaXQgcG9z c2libGUgdG8gbm90IGVtaXQgZ2VuZXJhdGVkIGNvZGUgdGhhdCdzIGd1YXJkZWQgYnkKKyAgICAg ICAgRU5BQkxFKElOU1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpLiBUaGlzIGNvZGUgaXMg bm90IG5lZWRlZCBieQorICAgICAgICBiYWNrZW5kIGRpc3BhdGNoZXJzIGdlbmVyYXRlZCBvdXRz aWRlIG9mIEphdmFTY3JpcHRDb3JlLiBXZSBjYW4ndCBqdXN0CisgICAgICAgIGRlZmluZSBpdCB0 byAwIGZvciBXZWJLaXQyLCBzaW5jZSBpdCdzIGRlZmluZWQgdG8gMSBpbiA8d3RmL1BsYXRmb3Jt Lmg+CisgICAgICAgIGluIHRoZSBjb25maWd1cmF0aW9ucyB3aGVyZSB0aGUgY29kZSBpcyBhY3R1 YWxseSB1c2VkLgorCisgICAgICAgIEFkZCBhIG5ldyBvcHQtaW4gRnJhbWV3b3JrIGNvbmZpZ3Vy YXRpb24gb3B0aW9uIHRoYXQgdHVybnMgb24gZ2VuZXJhdGluZworICAgICAgICB0aGlzIGNvZGUu IEFkanVzdCBob3cgdGhlIGNvZGUgaXMgZ2VuZXJhdGVkIHNvIHRoYXQgaXQgY2FuIGJlIGVhc2ls eSBleGNsdWRlZC4KKworICAgICAgICAqIGluc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vY3BwX2dl bmVyYXRvcl90ZW1wbGF0ZXMucHk6CisgICAgICAgIE1ha2UgYSBzZXBhcmF0ZSB0ZW1wbGF0ZSBm b3IgdGhlIGRlY2xhcmF0aW9ucyB0aGF0IGFyZSBndWFyZGVkLgorICAgICAgICBBZGQgYW4gaW5p dGlhbGl6ZXIgZXhwcmVzc2lvbiBzbyB0aGUgb3JkZXIgb2YgaW5pdGFsaXplcnMgZG9lc24ndCBt YXR0ZXIuCisKKyAgICAgICAgKiBpbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2Nw cF9iYWNrZW5kX2Rpc3BhdGNoZXJfaGVhZGVyLnB5OgorICAgICAgICAoQ3BwQmFja2VuZERpc3Bh dGNoZXJIZWFkZXJHZW5lcmF0b3IuZ2VuZXJhdGVfb3V0cHV0KTogQWRkIGEgc2V0dGluZyBjaGVj ay4KKyAgICAgICAgKENwcEJhY2tlbmREaXNwYXRjaGVySGVhZGVyR2VuZXJhdG9yLl9nZW5lcmF0 ZV9kaXNwYXRjaGVyX2RlY2xhcmF0aW9uc19mb3JfZG9tYWluKToKKyAgICAgICAgSWYgdGhlIGRl Y2xhcmF0aW9ucyBhcmUgbmVlZGVkLCB0aGV5IHdpbGwgYmUgYXBwZW5kZWQgdG8gdGhlIGVuZCBv ZiB0aGUKKyAgICAgICAgZGVjbGFyYXRpb25zIGxpc3QuCisKKyAgICAgICAgKiBpbnNwZWN0b3Iv c2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2NwcF9iYWNrZW5kX2Rpc3BhdGNoZXJfaW1wbGVtZW50 YXRpb24ucHk6CisgICAgICAgIChDcHBCYWNrZW5kRGlzcGF0Y2hlckltcGxlbWVudGF0aW9uR2Vu ZXJhdG9yLmdlbmVyYXRlX291dHB1dCk6IEFkZCBhIHNldHRpbmcgY2hlY2suCisgICAgICAgIChD cHBCYWNrZW5kRGlzcGF0Y2hlckltcGxlbWVudGF0aW9uR2VuZXJhdG9yLl9nZW5lcmF0ZV9kaXNw YXRjaGVyX2ltcGxlbWVudGF0aW9uX2Zvcl9jb21tYW5kKTogQWRkIGEgc2V0dGluZyBjaGVjay4K KworICAgICAgICAqIGluc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vbW9kZWxzLnB5OiBTZXQgdGhl ICdhbHRlcm5hdGVfZGlzcGF0Y2hlcnMnIHNldHRpbmcKKyAgICAgICAgdG8gVHJ1ZSBmb3IgRnJh bWV3b3JrLkphdmFTY3JpcHRDb3JlIG9ubHkuIEl0J3Mgbm90IG5lZWRlZCBlbHNld2hlcmUuCisK KyAgICAgICAgUmViYXNlbGluZSBhZmZlY3RlZCB0ZXN0cy4KKworICAgICAgICAqIGluc3BlY3Rv ci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2NvbW1hbmRzLXdpdGgtYXN5bmMtYXR0cmlidXRlLmpz b24tcmVzdWx0OgorICAgICAgICAqIGluc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2Nv bW1hbmRzLXdpdGgtb3B0aW9uYWwtY2FsbC1yZXR1cm4tcGFyYW1ldGVycy5qc29uLXJlc3VsdDoK KyAgICAgICAgKiBpbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9kb21haW5zLXdpdGgt dmFyeWluZy1jb21tYW5kLXNpemVzLmpzb24tcmVzdWx0OgorICAgICAgICAqIGluc3BlY3Rvci9z Y3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2VudW0tdmFsdWVzLmpzb24tcmVzdWx0OgorICAgICAgICAq IGluc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2dlbmVyYXRlLWRvbWFpbnMtd2l0aC1m ZWF0dXJlLWd1YXJkcy5qc29uLXJlc3VsdDoKKworMjAxNi0wMi0yMCAgQnJpYW4gQnVyZyAgPGJi dXJnQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBjbGVhbiB1cCBnZW5lcmF0 b3Igc2VsZWN0aW9uIGluIGdlbmVyYXRlLWluc3BlY3Rvci1wcm90b2NvbC1iaW5kaW5ncy5weQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0NTA1CiAg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNDc1ODA0Mj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2NwcF9nZW5lcmF0b3JfdGVtcGxh dGVzLnB5IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4v Y3BwX2dlbmVyYXRvcl90ZW1wbGF0ZXMucHkKaW5kZXggYzg1NmZlYjQyN2RhOGUzZjI0ZjIyMTYy NTUwMzlkNzE5ODRlMzdhZS4uNWMzMGQwOTBlMzc0ZDA5N2RmMGI0OTZmYjFkZGI4ZGQ1ODIyNGJj YiAxMDA3NTUKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2Nv ZGVnZW4vY3BwX2dlbmVyYXRvcl90ZW1wbGF0ZXMucHkKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vY3BwX2dlbmVyYXRvcl90ZW1wbGF0ZXMucHkK QEAgLTEwNSwxNCArMTA1LDE2IEBAIHB1YmxpYzoKICR7Y29tbWFuZERlY2xhcmF0aW9uc30KIHBy aXZhdGU6CiAgICAgJHtkb21haW5OYW1lfUJhY2tlbmREaXNwYXRjaGVyKEJhY2tlbmREaXNwYXRj aGVyJiwgJHtkb21haW5OYW1lfUJhY2tlbmREaXNwYXRjaGVySGFuZGxlciopOwotICAgICR7ZG9t YWluTmFtZX1CYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIqIG1fYWdlbnQ7Ci0jaWYgRU5BQkxFKElO U1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpCisgICAgJHtkb21haW5OYW1lfUJhY2tlbmRE aXNwYXRjaGVySGFuZGxlciogbV9hZ2VudCB7IG51bGxwdHIgfTsKK307IiIiKQorCisgICAgQmFj a2VuZERpc3BhdGNoZXJIZWFkZXJEb21haW5EaXNwYXRjaGVyQWx0ZXJuYXRlc0RlY2xhcmF0aW9u ID0gKAorICAgICIiIiNpZiBFTkFCTEUoSU5TUEVDVE9SX0FMVEVSTkFURV9ESVNQQVRDSEVSUykK IHB1YmxpYzoKICAgICB2b2lkIHNldEFsdGVybmF0ZURpc3BhdGNoZXIoQWx0ZXJuYXRlJHtkb21h aW5OYW1lfUJhY2tlbmREaXNwYXRjaGVyKiBhbHRlcm5hdGVEaXNwYXRjaGVyKSB7IG1fYWx0ZXJu YXRlRGlzcGF0Y2hlciA9IGFsdGVybmF0ZURpc3BhdGNoZXI7IH0KIHByaXZhdGU6Ci0gICAgQWx0 ZXJuYXRlJHtkb21haW5OYW1lfUJhY2tlbmREaXNwYXRjaGVyKiBtX2FsdGVybmF0ZURpc3BhdGNo ZXI7Ci0jZW5kaWYKLX07IiIiKQorICAgIEFsdGVybmF0ZSR7ZG9tYWluTmFtZX1CYWNrZW5kRGlz cGF0Y2hlciogbV9hbHRlcm5hdGVEaXNwYXRjaGVyIHsgbnVsbHB0ciB9OworI2VuZGlmIiIiKQog CiAgICAgQmFja2VuZERpc3BhdGNoZXJIZWFkZXJBc3luY0NvbW1hbmREZWNsYXJhdGlvbiA9ICgK ICAgICAiIiIgICAgJHtjbGFzc0FuZEV4cG9ydE1hY3JvfSAke2NhbGxiYWNrTmFtZX0gOiBwdWJs aWMgQmFja2VuZERpc3BhdGNoZXI6OkNhbGxiYWNrQmFzZSB7CkBAIC0xNzYsOSArMTc4LDYgQEAg JHtkaXNwYXRjaENhc2VzfQogJHtkb21haW5OYW1lfUJhY2tlbmREaXNwYXRjaGVyOjoke2RvbWFp bk5hbWV9QmFja2VuZERpc3BhdGNoZXIoQmFja2VuZERpc3BhdGNoZXImIGJhY2tlbmREaXNwYXRj aGVyLCAke2RvbWFpbk5hbWV9QmFja2VuZERpc3BhdGNoZXJIYW5kbGVyKiBhZ2VudCkKICAgICA6 IFN1cHBsZW1lbnRhbEJhY2tlbmREaXNwYXRjaGVyKGJhY2tlbmREaXNwYXRjaGVyKQogICAgICwg bV9hZ2VudChhZ2VudCkKLSNpZiBFTkFCTEUoSU5TUEVDVE9SX0FMVEVSTkFURV9ESVNQQVRDSEVS UykKLSAgICAsIG1fYWx0ZXJuYXRlRGlzcGF0Y2hlcihudWxscHRyKQotI2VuZGlmCiB7CiAgICAg bV9iYWNrZW5kRGlzcGF0Y2hlci0+cmVnaXN0ZXJEaXNwYXRjaGVyRm9yRG9tYWluKEFTQ0lJTGl0 ZXJhbCgiJHtkb21haW5OYW1lfSIpLCB0aGlzKTsKIH0iIiIpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9jcHBfYmFj a2VuZF9kaXNwYXRjaGVyX2hlYWRlci5weSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2NwcF9iYWNrZW5kX2Rpc3BhdGNoZXJfaGVhZGVy LnB5CmluZGV4IDJlNWZmN2E2YTYzZmJiZTBmNTliNTAyOGJkODZmOGM0MWNjYjYxMzYuLjE3Yzgx MDJjMDhjOWE0MTdmYTgxM2U3ZjM3NGY4OGY3NTE2Yjg2ZTggMTAwNzU1Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2NwcF9iYWNr ZW5kX2Rpc3BhdGNoZXJfaGVhZGVyLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2NwcF9iYWNrZW5kX2Rpc3BhdGNoZXJfaGVh ZGVyLnB5CkBAIC02Nyw3ICs2Nyw4IEBAIGNsYXNzIENwcEJhY2tlbmREaXNwYXRjaGVySGVhZGVy R2VuZXJhdG9yKEdlbmVyYXRvcik6CiAgICAgICAgIHNlY3Rpb25zID0gW10KICAgICAgICAgc2Vj dGlvbnMuYXBwZW5kKHNlbGYuZ2VuZXJhdGVfbGljZW5zZSgpKQogICAgICAgICBzZWN0aW9ucy5h cHBlbmQoVGVtcGxhdGUoQ3BwVGVtcGxhdGVzLkhlYWRlclByZWx1ZGUpLnN1YnN0aXR1dGUoTm9u ZSwgKipoZWFkZXJfYXJncykpCi0gICAgICAgIHNlY3Rpb25zLmFwcGVuZChzZWxmLl9nZW5lcmF0 ZV9hbHRlcm5hdGVfaGFuZGxlcl9mb3J3YXJkX2RlY2xhcmF0aW9uc19mb3JfZG9tYWlucyhkb21h aW5zKSkKKyAgICAgICAgaWYgc2VsZi5tb2RlbCgpLmZyYW1ld29yay5zZXR0aW5nKCdhbHRlcm5h dGVfZGlzcGF0Y2hlcnMnLCBGYWxzZSk6CisgICAgICAgICAgICBzZWN0aW9ucy5hcHBlbmQoc2Vs Zi5fZ2VuZXJhdGVfYWx0ZXJuYXRlX2hhbmRsZXJfZm9yd2FyZF9kZWNsYXJhdGlvbnNfZm9yX2Rv bWFpbnMoZG9tYWlucykpCiAgICAgICAgIHNlY3Rpb25zLmV4dGVuZChtYXAoc2VsZi5fZ2VuZXJh dGVfaGFuZGxlcl9kZWNsYXJhdGlvbnNfZm9yX2RvbWFpbiwgZG9tYWlucykpCiAgICAgICAgIHNl Y3Rpb25zLmV4dGVuZChtYXAoc2VsZi5fZ2VuZXJhdGVfZGlzcGF0Y2hlcl9kZWNsYXJhdGlvbnNf Zm9yX2RvbWFpbiwgZG9tYWlucykpCiAgICAgICAgIHNlY3Rpb25zLmFwcGVuZChUZW1wbGF0ZShD cHBUZW1wbGF0ZXMuSGVhZGVyUG9zdGx1ZGUpLnN1YnN0aXR1dGUoTm9uZSwgKipoZWFkZXJfYXJn cykpCkBAIC0xOTYsNiArMTk3LDE0IEBAIGNsYXNzIENwcEJhY2tlbmREaXNwYXRjaGVySGVhZGVy R2VuZXJhdG9yKEdlbmVyYXRvcik6CiAgICAgICAgICAgICBkZWNsYXJhdGlvbnMuYXBwZW5kKCdw cml2YXRlOicpCiAgICAgICAgIGRlY2xhcmF0aW9ucy5leHRlbmQobWFwKHNlbGYuX2dlbmVyYXRl X2Rpc3BhdGNoZXJfZGVjbGFyYXRpb25fZm9yX2NvbW1hbmQsIGRvbWFpbi5jb21tYW5kcykpCiAK KyAgICAgICAgZGVjbGFyYXRpb25fYXJncyA9IHsKKyAgICAgICAgICAgICdkb21haW5OYW1lJzog ZG9tYWluLmRvbWFpbl9uYW1lLAorICAgICAgICB9CisKKyAgICAgICAgIyBBZGQgaW4gYSBmZXcg bW9yZSBkZWNsYXJhdGlvbnMgYXQgdGhlIGVuZCBpZiBuZWVkZWQuCisgICAgICAgIGlmIHNlbGYu bW9kZWwoKS5mcmFtZXdvcmsuc2V0dGluZygnYWx0ZXJuYXRlX2Rpc3BhdGNoZXJzJywgRmFsc2Up OgorICAgICAgICAgICAgZGVjbGFyYXRpb25zLmFwcGVuZChUZW1wbGF0ZShDcHBUZW1wbGF0ZXMu QmFja2VuZERpc3BhdGNoZXJIZWFkZXJEb21haW5EaXNwYXRjaGVyQWx0ZXJuYXRlc0RlY2xhcmF0 aW9uKS5zdWJzdGl0dXRlKE5vbmUsICoqZGVjbGFyYXRpb25fYXJncykpCisKICAgICAgICAgaGFu ZGxlcl9hcmdzID0gewogICAgICAgICAgICAgJ2NsYXNzQW5kRXhwb3J0TWFjcm8nOiAiICIuam9p bihjbGFzc0NvbXBvbmVudHMpLAogICAgICAgICAgICAgJ2RvbWFpbk5hbWUnOiBkb21haW4uZG9t YWluX25hbWUsCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Nj cmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9jcHBfYmFja2VuZF9kaXNwYXRjaGVyX2ltcGxlbWVudGF0 aW9uLnB5IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4v Z2VuZXJhdGVfY3BwX2JhY2tlbmRfZGlzcGF0Y2hlcl9pbXBsZW1lbnRhdGlvbi5weQppbmRleCA4 ZjNkZjgwZWUyNzA3NDk4ODY2MGVjNDg3YTRkOWM1Njk5NTJhYzMwLi4wYTQ2MTgzNGQ2NWQyNWU1 YzBiNDZlMmNhNGQ5NjZiNDJlZjE0MDkyIDEwMDc1NQotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0ZV9jcHBfYmFja2VuZF9kaXNwYXRj aGVyX2ltcGxlbWVudGF0aW9uLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2NwcF9iYWNrZW5kX2Rpc3BhdGNoZXJfaW1wbGVt ZW50YXRpb24ucHkKQEAgLTU1LDEwICs1NSwxMiBAQCBjbGFzcyBDcHBCYWNrZW5kRGlzcGF0Y2hl ckltcGxlbWVudGF0aW9uR2VuZXJhdG9yKEdlbmVyYXRvcik6CiAgICAgICAgICAgICAnPHd0Zi90 ZXh0L0NTdHJpbmcuaD4nXQogCiAgICAgICAgIHNlY29uZGFyeV9pbmNsdWRlcyA9IFsnI2luY2x1 ZGUgJXMnICUgaGVhZGVyIGZvciBoZWFkZXIgaW4gc2Vjb25kYXJ5X2hlYWRlcnNdCi0gICAgICAg IHNlY29uZGFyeV9pbmNsdWRlcy5hcHBlbmQoJycpCi0gICAgICAgIHNlY29uZGFyeV9pbmNsdWRl cy5hcHBlbmQoJyNpZiBFTkFCTEUoSU5TUEVDVE9SX0FMVEVSTkFURV9ESVNQQVRDSEVSUyknKQot ICAgICAgICBzZWNvbmRhcnlfaW5jbHVkZXMuYXBwZW5kKCcjaW5jbHVkZSAiSW5zcGVjdG9yQWx0 ZXJuYXRlQmFja2VuZERpc3BhdGNoZXJzLmgiJykKLSAgICAgICAgc2Vjb25kYXJ5X2luY2x1ZGVz LmFwcGVuZCgnI2VuZGlmJykKKworICAgICAgICBpZiBzZWxmLm1vZGVsKCkuZnJhbWV3b3JrLnNl dHRpbmcoJ2FsdGVybmF0ZV9kaXNwYXRjaGVycycsIEZhbHNlKToKKyAgICAgICAgICAgIHNlY29u ZGFyeV9pbmNsdWRlcy5hcHBlbmQoJycpCisgICAgICAgICAgICBzZWNvbmRhcnlfaW5jbHVkZXMu YXBwZW5kKCcjaWYgRU5BQkxFKElOU1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpJykKKyAg ICAgICAgICAgIHNlY29uZGFyeV9pbmNsdWRlcy5hcHBlbmQoJyNpbmNsdWRlICJJbnNwZWN0b3JB bHRlcm5hdGVCYWNrZW5kRGlzcGF0Y2hlcnMuaCInKQorICAgICAgICAgICAgc2Vjb25kYXJ5X2lu Y2x1ZGVzLmFwcGVuZCgnI2VuZGlmJykKIAogICAgICAgICBoZWFkZXJfYXJncyA9IHsKICAgICAg ICAgICAgICdwcmltYXJ5SW5jbHVkZSc6ICciSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXJzLmgi JywKQEAgLTI3NiwxMyArMjc4LDE0IEBAIGNsYXNzIENwcEJhY2tlbmREaXNwYXRjaGVySW1wbGVt ZW50YXRpb25HZW5lcmF0b3IoR2VuZXJhdG9yKToKICAgICAgICAgaWYgbGVuKGNvbW1hbmQuY2Fs bF9wYXJhbWV0ZXJzKSA+IDA6CiAgICAgICAgICAgICBsaW5lcy5hcHBlbmQoVGVtcGxhdGUoQ3Bw VGVtcGxhdGVzLkJhY2tlbmREaXNwYXRjaGVySW1wbGVtZW50YXRpb25QcmVwYXJlQ29tbWFuZEFy Z3VtZW50cykuc3Vic3RpdHV0ZShOb25lLCAqKmNvbW1hbmRfYXJncykpCiAKLSAgICAgICAgbGlu ZXMuYXBwZW5kKCcjaWYgRU5BQkxFKElOU1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpJykK LSAgICAgICAgbGluZXMuYXBwZW5kKCcgICAgaWYgKG1fYWx0ZXJuYXRlRGlzcGF0Y2hlcikgeycp Ci0gICAgICAgIGxpbmVzLmFwcGVuZCgnICAgICAgICBtX2FsdGVybmF0ZURpc3BhdGNoZXItPiUo Y29tbWFuZE5hbWUpcyglKGFsdGVybmF0ZUludm9jYXRpb25QYXJhbWV0ZXJzKXMpOycgJSBjb21t YW5kX2FyZ3MpCi0gICAgICAgIGxpbmVzLmFwcGVuZCgnICAgICAgICByZXR1cm47JykKLSAgICAg ICAgbGluZXMuYXBwZW5kKCcgICAgfScpCi0gICAgICAgIGxpbmVzLmFwcGVuZCgnI2VuZGlmJykK LSAgICAgICAgbGluZXMuYXBwZW5kKCcnKQorICAgICAgICBpZiBzZWxmLm1vZGVsKCkuZnJhbWV3 b3JrLnNldHRpbmcoJ2FsdGVybmF0ZV9kaXNwYXRjaGVycycsIEZhbHNlKToKKyAgICAgICAgICAg IGxpbmVzLmFwcGVuZCgnI2lmIEVOQUJMRShJTlNQRUNUT1JfQUxURVJOQVRFX0RJU1BBVENIRVJT KScpCisgICAgICAgICAgICBsaW5lcy5hcHBlbmQoJyAgICBpZiAobV9hbHRlcm5hdGVEaXNwYXRj aGVyKSB7JykKKyAgICAgICAgICAgIGxpbmVzLmFwcGVuZCgnICAgICAgICBtX2FsdGVybmF0ZURp c3BhdGNoZXItPiUoY29tbWFuZE5hbWUpcyglKGFsdGVybmF0ZUludm9jYXRpb25QYXJhbWV0ZXJz KXMpOycgJSBjb21tYW5kX2FyZ3MpCisgICAgICAgICAgICBsaW5lcy5hcHBlbmQoJyAgICAgICAg cmV0dXJuOycpCisgICAgICAgICAgICBsaW5lcy5hcHBlbmQoJyAgICB9JykKKyAgICAgICAgICAg IGxpbmVzLmFwcGVuZCgnI2VuZGlmJykKKyAgICAgICAgICAgIGxpbmVzLmFwcGVuZCgnJykKIAog ICAgICAgICBsaW5lcy5hcHBlbmQoJyAgICBFcnJvclN0cmluZyBlcnJvcjsnKQogICAgICAgICBs aW5lcy5hcHBlbmQoJyAgICBSZWY8SW5zcGVjdG9yT2JqZWN0PiByZXN1bHQgPSBJbnNwZWN0b3JP YmplY3Q6OmNyZWF0ZSgpOycpCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL3NjcmlwdHMvY29kZWdlbi9tb2RlbHMucHkgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9tb2RlbHMucHkKaW5kZXggZWMxNmExMjkxMjk4OTQ2 NmRmYTdkNTYwMTdmN2Q2NzQ3M2FiYTMyMy4uZjRmYTQ0ODRlZTE4ZTk2ZDk5ODkxZmU2ZGM4N2Fh M2MzOTI4MDdkMCAxMDA3NTUKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9z Y3JpcHRzL2NvZGVnZW4vbW9kZWxzLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL21vZGVscy5weQpAQCAtNDIsMTIgKzQyLDE0IEBAIF9GUkFN RVdPUktfQ09ORklHX01BUCA9IHsKICAgICAiR2xvYmFsIjogewogICAgIH0sCiAgICAgIkphdmFT Y3JpcHRDb3JlIjogewotICAgICAgICAiZXhwb3J0X21hY3JvIjogIkpTX0VYUE9SVF9QUklWQVRF IgorICAgICAgICAiZXhwb3J0X21hY3JvIjogIkpTX0VYUE9SVF9QUklWQVRFIiwKKyAgICAgICAg ImFsdGVybmF0ZV9kaXNwYXRjaGVycyI6IFRydWUsCiAgICAgfSwKICAgICAiV2ViSW5zcGVjdG9y IjogewogICAgIH0sCiAgICAgIyBVc2VkIGZvciBjb2RlIGdlbmVyYXRvciB0ZXN0cy4KICAgICAi VGVzdCI6IHsKKyAgICAgICAgImFsdGVybmF0ZV9kaXNwYXRjaGVycyI6IFRydWUsCiAgICAgfQog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMv dGVzdHMvZXhwZWN0ZWQvY29tbWFuZHMtd2l0aC1hc3luYy1hdHRyaWJ1dGUuanNvbi1yZXN1bHQg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQv Y29tbWFuZHMtd2l0aC1hc3luYy1hdHRyaWJ1dGUuanNvbi1yZXN1bHQKaW5kZXggN2M1ZmYxNzJm Nzk1ZDQ4OGU5NzA5OTQ4MDM3NzRiMjI5NzM3OWRkYS4uMGU2NDA0ZDlhOTY3YmJjZDg2YzJmNzU3 M2YyZDQxMDRlMTE0ZTlmYiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3Bl Y3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2NvbW1hbmRzLXdpdGgtYXN5bmMtYXR0cmlidXRl Lmpzb24tcmVzdWx0CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0 cy90ZXN0cy9leHBlY3RlZC9jb21tYW5kcy13aXRoLWFzeW5jLWF0dHJpYnV0ZS5qc29uLXJlc3Vs dApAQCAtMTk0LDE1ICsxOTQsMTUgQEAgcHJpdmF0ZToKICAgICB2b2lkIGV4ZWN1dGVTUUxBc3lu Y09wdGlvbmFsUmV0dXJuVmFsdWVzKGxvbmcgcmVxdWVzdElkLCBSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiYmIHBhcmFtZXRlcnMpOwogICAgIHZvaWQgZXhlY3V0ZVNRTFN5bmMobG9uZyByZXF1ZXN0 SWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiYgcGFyYW1ldGVycyk7CiAgICAgdm9pZCBleGVj dXRlU1FMQXN5bmMobG9uZyByZXF1ZXN0SWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiYgcGFy YW1ldGVycyk7Ci1wcml2YXRlOgotICAgIERhdGFiYXNlQmFja2VuZERpc3BhdGNoZXIoQmFja2Vu ZERpc3BhdGNoZXImLCBEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVySGFuZGxlciopOwotICAgIERh dGFiYXNlQmFja2VuZERpc3BhdGNoZXJIYW5kbGVyKiBtX2FnZW50OwogI2lmIEVOQUJMRShJTlNQ RUNUT1JfQUxURVJOQVRFX0RJU1BBVENIRVJTKQogcHVibGljOgogICAgIHZvaWQgc2V0QWx0ZXJu YXRlRGlzcGF0Y2hlcihBbHRlcm5hdGVEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyKiBhbHRlcm5h dGVEaXNwYXRjaGVyKSB7IG1fYWx0ZXJuYXRlRGlzcGF0Y2hlciA9IGFsdGVybmF0ZURpc3BhdGNo ZXI7IH0KIHByaXZhdGU6Ci0gICAgQWx0ZXJuYXRlRGF0YWJhc2VCYWNrZW5kRGlzcGF0Y2hlciog bV9hbHRlcm5hdGVEaXNwYXRjaGVyOworICAgIEFsdGVybmF0ZURhdGFiYXNlQmFja2VuZERpc3Bh dGNoZXIqIG1fYWx0ZXJuYXRlRGlzcGF0Y2hlciB7IG51bGxwdHIgfTsKICNlbmRpZgorcHJpdmF0 ZToKKyAgICBEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyKEJhY2tlbmREaXNwYXRjaGVyJiwgRGF0 YWJhc2VCYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIqKTsKKyAgICBEYXRhYmFzZUJhY2tlbmREaXNw YXRjaGVySGFuZGxlciogbV9hZ2VudCB7IG51bGxwdHIgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNl IEluc3BlY3RvcgpAQCAtMjY1LDkgKzI2NSw2IEBAIFJlZjxEYXRhYmFzZUJhY2tlbmREaXNwYXRj aGVyPiBEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyOjpjcmVhdGUoQmFja2VuZERpc3BhdGNoCiBE YXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyOjpEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyKEJhY2tl bmREaXNwYXRjaGVyJiBiYWNrZW5kRGlzcGF0Y2hlciwgRGF0YWJhc2VCYWNrZW5kRGlzcGF0Y2hl ckhhbmRsZXIqIGFnZW50KQogICAgIDogU3VwcGxlbWVudGFsQmFja2VuZERpc3BhdGNoZXIoYmFj a2VuZERpc3BhdGNoZXIpCiAgICAgLCBtX2FnZW50KGFnZW50KQotI2lmIEVOQUJMRShJTlNQRUNU T1JfQUxURVJOQVRFX0RJU1BBVENIRVJTKQotICAgICwgbV9hbHRlcm5hdGVEaXNwYXRjaGVyKG51 bGxwdHIpCi0jZW5kaWYKIHsKICAgICBtX2JhY2tlbmREaXNwYXRjaGVyLT5yZWdpc3RlckRpc3Bh dGNoZXJGb3JEb21haW4oQVNDSUlMaXRlcmFsKCJEYXRhYmFzZSIpLCB0aGlzKTsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBl Y3RlZC9jb21tYW5kcy13aXRoLW9wdGlvbmFsLWNhbGwtcmV0dXJuLXBhcmFtZXRlcnMuanNvbi1y ZXN1bHQgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMvZXhw ZWN0ZWQvY29tbWFuZHMtd2l0aC1vcHRpb25hbC1jYWxsLXJldHVybi1wYXJhbWV0ZXJzLmpzb24t cmVzdWx0CmluZGV4IDJjNTFmZGZmMmU1NGM4ZjIwOWQ5MTA4YTI5N2Y1ZjQ5NWU0MGNmYzMuLmYw YzRjMWViMGIzMmM0ZGQ2NmYwODkxM2IyMWQ4YWRjNjkxNjQ2NzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9jb21tYW5k cy13aXRoLW9wdGlvbmFsLWNhbGwtcmV0dXJuLXBhcmFtZXRlcnMuanNvbi1yZXN1bHQKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2Nv bW1hbmRzLXdpdGgtb3B0aW9uYWwtY2FsbC1yZXR1cm4tcGFyYW1ldGVycy5qc29uLXJlc3VsdApA QCAtMTc1LDE1ICsxNzUsMTUgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lkIGV4ZWN1dGVB bGxPcHRpb25hbFBhcmFtZXRlcnMobG9uZyByZXF1ZXN0SWQsIFJlZlB0cjxJbnNwZWN0b3JPYmpl Y3Q+JiYgcGFyYW1ldGVycyk7CiAgICAgdm9pZCBleGVjdXRlTm9PcHRpb25hbFBhcmFtZXRlcnMo bG9uZyByZXF1ZXN0SWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiYgcGFyYW1ldGVycyk7Ci1w cml2YXRlOgotICAgIERhdGFiYXNlQmFja2VuZERpc3BhdGNoZXIoQmFja2VuZERpc3BhdGNoZXIm LCBEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVySGFuZGxlciopOwotICAgIERhdGFiYXNlQmFja2Vu ZERpc3BhdGNoZXJIYW5kbGVyKiBtX2FnZW50OwogI2lmIEVOQUJMRShJTlNQRUNUT1JfQUxURVJO QVRFX0RJU1BBVENIRVJTKQogcHVibGljOgogICAgIHZvaWQgc2V0QWx0ZXJuYXRlRGlzcGF0Y2hl cihBbHRlcm5hdGVEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyKiBhbHRlcm5hdGVEaXNwYXRjaGVy KSB7IG1fYWx0ZXJuYXRlRGlzcGF0Y2hlciA9IGFsdGVybmF0ZURpc3BhdGNoZXI7IH0KIHByaXZh dGU6Ci0gICAgQWx0ZXJuYXRlRGF0YWJhc2VCYWNrZW5kRGlzcGF0Y2hlciogbV9hbHRlcm5hdGVE aXNwYXRjaGVyOworICAgIEFsdGVybmF0ZURhdGFiYXNlQmFja2VuZERpc3BhdGNoZXIqIG1fYWx0 ZXJuYXRlRGlzcGF0Y2hlciB7IG51bGxwdHIgfTsKICNlbmRpZgorcHJpdmF0ZToKKyAgICBEYXRh YmFzZUJhY2tlbmREaXNwYXRjaGVyKEJhY2tlbmREaXNwYXRjaGVyJiwgRGF0YWJhc2VCYWNrZW5k RGlzcGF0Y2hlckhhbmRsZXIqKTsKKyAgICBEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVySGFuZGxl ciogbV9hZ2VudCB7IG51bGxwdHIgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIEluc3BlY3RvcgpA QCAtMjQ2LDkgKzI0Niw2IEBAIFJlZjxEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyPiBEYXRhYmFz ZUJhY2tlbmREaXNwYXRjaGVyOjpjcmVhdGUoQmFja2VuZERpc3BhdGNoCiBEYXRhYmFzZUJhY2tl bmREaXNwYXRjaGVyOjpEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyKEJhY2tlbmREaXNwYXRjaGVy JiBiYWNrZW5kRGlzcGF0Y2hlciwgRGF0YWJhc2VCYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIqIGFn ZW50KQogICAgIDogU3VwcGxlbWVudGFsQmFja2VuZERpc3BhdGNoZXIoYmFja2VuZERpc3BhdGNo ZXIpCiAgICAgLCBtX2FnZW50KGFnZW50KQotI2lmIEVOQUJMRShJTlNQRUNUT1JfQUxURVJOQVRF X0RJU1BBVENIRVJTKQotICAgICwgbV9hbHRlcm5hdGVEaXNwYXRjaGVyKG51bGxwdHIpCi0jZW5k aWYKIHsKICAgICBtX2JhY2tlbmREaXNwYXRjaGVyLT5yZWdpc3RlckRpc3BhdGNoZXJGb3JEb21h aW4oQVNDSUlMaXRlcmFsKCJEYXRhYmFzZSIpLCB0aGlzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9kb21haW5z LXdpdGgtdmFyeWluZy1jb21tYW5kLXNpemVzLmpzb24tcmVzdWx0IGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2RvbWFpbnMtd2l0aC12YXJ5 aW5nLWNvbW1hbmQtc2l6ZXMuanNvbi1yZXN1bHQKaW5kZXggYjM4YWUyZjEzZmVmYzNjZmQ2ODQ5 ZGVhYjFjOTVjZDZlNzhhZDliNi4uNjJmYTZkZDdmNWY1ZWFlN2Q4YjkzZmY0N2E3MThjM2ZjNTVm MWQzNyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRz L3Rlc3RzL2V4cGVjdGVkL2RvbWFpbnMtd2l0aC12YXJ5aW5nLWNvbW1hbmQtc2l6ZXMuanNvbi1y ZXN1bHQKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL3Rlc3Rz L2V4cGVjdGVkL2RvbWFpbnMtd2l0aC12YXJ5aW5nLWNvbW1hbmQtc2l6ZXMuanNvbi1yZXN1bHQK QEAgLTE5MiwxNSArMTkyLDE1IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2go bG9uZyByZXF1ZXN0SWQsIGNvbnN0IFN0cmluZyYgbWV0aG9kLCBSZWY8SW5zcGVjdG9yT2JqZWN0 PiYmIG1lc3NhZ2UpIG92ZXJyaWRlOwogcHJpdmF0ZToKICAgICB2b2lkIGxvYWRSZXNvdXJjZTEo bG9uZyByZXF1ZXN0SWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiYgcGFyYW1ldGVycyk7Ci1w cml2YXRlOgotICAgIE5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXIoQmFja2VuZERpc3BhdGNoZXIm LCBOZXR3b3JrMUJhY2tlbmREaXNwYXRjaGVySGFuZGxlciopOwotICAgIE5ldHdvcmsxQmFja2Vu ZERpc3BhdGNoZXJIYW5kbGVyKiBtX2FnZW50OwogI2lmIEVOQUJMRShJTlNQRUNUT1JfQUxURVJO QVRFX0RJU1BBVENIRVJTKQogcHVibGljOgogICAgIHZvaWQgc2V0QWx0ZXJuYXRlRGlzcGF0Y2hl cihBbHRlcm5hdGVOZXR3b3JrMUJhY2tlbmREaXNwYXRjaGVyKiBhbHRlcm5hdGVEaXNwYXRjaGVy KSB7IG1fYWx0ZXJuYXRlRGlzcGF0Y2hlciA9IGFsdGVybmF0ZURpc3BhdGNoZXI7IH0KIHByaXZh dGU6Ci0gICAgQWx0ZXJuYXRlTmV0d29yazFCYWNrZW5kRGlzcGF0Y2hlciogbV9hbHRlcm5hdGVE aXNwYXRjaGVyOworICAgIEFsdGVybmF0ZU5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXIqIG1fYWx0 ZXJuYXRlRGlzcGF0Y2hlciB7IG51bGxwdHIgfTsKICNlbmRpZgorcHJpdmF0ZToKKyAgICBOZXR3 b3JrMUJhY2tlbmREaXNwYXRjaGVyKEJhY2tlbmREaXNwYXRjaGVyJiwgTmV0d29yazFCYWNrZW5k RGlzcGF0Y2hlckhhbmRsZXIqKTsKKyAgICBOZXR3b3JrMUJhY2tlbmREaXNwYXRjaGVySGFuZGxl ciogbV9hZ2VudCB7IG51bGxwdHIgfTsKIH07CiAKIGNsYXNzIE5ldHdvcmszQmFja2VuZERpc3Bh dGNoZXIgZmluYWwgOiBwdWJsaWMgU3VwcGxlbWVudGFsQmFja2VuZERpc3BhdGNoZXIgewpAQCAt MjE1LDE1ICsyMTUsMTUgQEAgcHJpdmF0ZToKICAgICB2b2lkIGxvYWRSZXNvdXJjZTUobG9uZyBy ZXF1ZXN0SWQsIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+JiYgcGFyYW1ldGVycyk7CiAgICAgdm9p ZCBsb2FkUmVzb3VyY2U2KGxvbmcgcmVxdWVzdElkLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYm IHBhcmFtZXRlcnMpOwogICAgIHZvaWQgbG9hZFJlc291cmNlNyhsb25nIHJlcXVlc3RJZCwgUmVm UHRyPEluc3BlY3Rvck9iamVjdD4mJiBwYXJhbWV0ZXJzKTsKLXByaXZhdGU6Ci0gICAgTmV0d29y azNCYWNrZW5kRGlzcGF0Y2hlcihCYWNrZW5kRGlzcGF0Y2hlciYsIE5ldHdvcmszQmFja2VuZERp c3BhdGNoZXJIYW5kbGVyKik7Ci0gICAgTmV0d29yazNCYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIq IG1fYWdlbnQ7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpCiBw dWJsaWM6CiAgICAgdm9pZCBzZXRBbHRlcm5hdGVEaXNwYXRjaGVyKEFsdGVybmF0ZU5ldHdvcmsz QmFja2VuZERpc3BhdGNoZXIqIGFsdGVybmF0ZURpc3BhdGNoZXIpIHsgbV9hbHRlcm5hdGVEaXNw YXRjaGVyID0gYWx0ZXJuYXRlRGlzcGF0Y2hlcjsgfQogcHJpdmF0ZToKLSAgICBBbHRlcm5hdGVO ZXR3b3JrM0JhY2tlbmREaXNwYXRjaGVyKiBtX2FsdGVybmF0ZURpc3BhdGNoZXI7CisgICAgQWx0 ZXJuYXRlTmV0d29yazNCYWNrZW5kRGlzcGF0Y2hlciogbV9hbHRlcm5hdGVEaXNwYXRjaGVyIHsg bnVsbHB0ciB9OwogI2VuZGlmCitwcml2YXRlOgorICAgIE5ldHdvcmszQmFja2VuZERpc3BhdGNo ZXIoQmFja2VuZERpc3BhdGNoZXImLCBOZXR3b3JrM0JhY2tlbmREaXNwYXRjaGVySGFuZGxlciop OworICAgIE5ldHdvcmszQmFja2VuZERpc3BhdGNoZXJIYW5kbGVyKiBtX2FnZW50IHsgbnVsbHB0 ciB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgSW5zcGVjdG9yCkBAIC0yODcsOSArMjg3LDYgQEAg UmVmPE5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXI+IE5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXI6 OmNyZWF0ZShCYWNrZW5kRGlzcGF0Y2gKIE5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXI6Ok5ldHdv cmsxQmFja2VuZERpc3BhdGNoZXIoQmFja2VuZERpc3BhdGNoZXImIGJhY2tlbmREaXNwYXRjaGVy LCBOZXR3b3JrMUJhY2tlbmREaXNwYXRjaGVySGFuZGxlciogYWdlbnQpCiAgICAgOiBTdXBwbGVt ZW50YWxCYWNrZW5kRGlzcGF0Y2hlcihiYWNrZW5kRGlzcGF0Y2hlcikKICAgICAsIG1fYWdlbnQo YWdlbnQpCi0jaWYgRU5BQkxFKElOU1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpCi0gICAg LCBtX2FsdGVybmF0ZURpc3BhdGNoZXIobnVsbHB0cikKLSNlbmRpZgogewogICAgIG1fYmFja2Vu ZERpc3BhdGNoZXItPnJlZ2lzdGVyRGlzcGF0Y2hlckZvckRvbWFpbihBU0NJSUxpdGVyYWwoIk5l dHdvcmsxIiksIHRoaXMpOwogfQpAQCAtMzM0LDkgKzMzMSw2IEBAIFJlZjxOZXR3b3JrM0JhY2tl bmREaXNwYXRjaGVyPiBOZXR3b3JrM0JhY2tlbmREaXNwYXRjaGVyOjpjcmVhdGUoQmFja2VuZERp c3BhdGNoCiBOZXR3b3JrM0JhY2tlbmREaXNwYXRjaGVyOjpOZXR3b3JrM0JhY2tlbmREaXNwYXRj aGVyKEJhY2tlbmREaXNwYXRjaGVyJiBiYWNrZW5kRGlzcGF0Y2hlciwgTmV0d29yazNCYWNrZW5k RGlzcGF0Y2hlckhhbmRsZXIqIGFnZW50KQogICAgIDogU3VwcGxlbWVudGFsQmFja2VuZERpc3Bh dGNoZXIoYmFja2VuZERpc3BhdGNoZXIpCiAgICAgLCBtX2FnZW50KGFnZW50KQotI2lmIEVOQUJM RShJTlNQRUNUT1JfQUxURVJOQVRFX0RJU1BBVENIRVJTKQotICAgICwgbV9hbHRlcm5hdGVEaXNw YXRjaGVyKG51bGxwdHIpCi0jZW5kaWYKIHsKICAgICBtX2JhY2tlbmREaXNwYXRjaGVyLT5yZWdp c3RlckRpc3BhdGNoZXJGb3JEb21haW4oQVNDSUlMaXRlcmFsKCJOZXR3b3JrMyIpLCB0aGlzKTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90 ZXN0cy9leHBlY3RlZC9lbnVtLXZhbHVlcy5qc29uLXJlc3VsdCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9lbnVtLXZhbHVlcy5qc29uLXJl c3VsdAppbmRleCBiNzAyYjAzZmI0MzY5NThlM2UzZjU4YTI5OThkYWMzYzdjOTg2YzE3Li44Mjg1 ZTg0NmIyYWExYTc4MDk2NTViMTM1ZTQ2ZGQ2NjIxZTQ5NzA5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZW51bS12YWx1 ZXMuanNvbi1yZXN1bHQKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3Jp cHRzL3Rlc3RzL2V4cGVjdGVkL2VudW0tdmFsdWVzLmpzb24tcmVzdWx0CkBAIC0xNzMsMTUgKzE3 MywxNSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoKGxvbmcgcmVxdWVzdElk LCBjb25zdCBTdHJpbmcmIG1ldGhvZCwgUmVmPEluc3BlY3Rvck9iamVjdD4mJiBtZXNzYWdlKSBv dmVycmlkZTsKIHByaXZhdGU6CiAgICAgdm9pZCBjb21tYW5kV2l0aEVudW1SZXR1cm5WYWx1ZShs b25nIHJlcXVlc3RJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mJiBwYXJhbWV0ZXJzKTsKLXBy aXZhdGU6Ci0gICAgQ29tbWFuZERvbWFpbkJhY2tlbmREaXNwYXRjaGVyKEJhY2tlbmREaXNwYXRj aGVyJiwgQ29tbWFuZERvbWFpbkJhY2tlbmREaXNwYXRjaGVySGFuZGxlciopOwotICAgIENvbW1h bmREb21haW5CYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIqIG1fYWdlbnQ7CiAjaWYgRU5BQkxFKElO U1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpCiBwdWJsaWM6CiAgICAgdm9pZCBzZXRBbHRl cm5hdGVEaXNwYXRjaGVyKEFsdGVybmF0ZUNvbW1hbmREb21haW5CYWNrZW5kRGlzcGF0Y2hlciog YWx0ZXJuYXRlRGlzcGF0Y2hlcikgeyBtX2FsdGVybmF0ZURpc3BhdGNoZXIgPSBhbHRlcm5hdGVE aXNwYXRjaGVyOyB9CiBwcml2YXRlOgotICAgIEFsdGVybmF0ZUNvbW1hbmREb21haW5CYWNrZW5k RGlzcGF0Y2hlciogbV9hbHRlcm5hdGVEaXNwYXRjaGVyOworICAgIEFsdGVybmF0ZUNvbW1hbmRE b21haW5CYWNrZW5kRGlzcGF0Y2hlciogbV9hbHRlcm5hdGVEaXNwYXRjaGVyIHsgbnVsbHB0ciB9 OwogI2VuZGlmCitwcml2YXRlOgorICAgIENvbW1hbmREb21haW5CYWNrZW5kRGlzcGF0Y2hlcihC YWNrZW5kRGlzcGF0Y2hlciYsIENvbW1hbmREb21haW5CYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIq KTsKKyAgICBDb21tYW5kRG9tYWluQmFja2VuZERpc3BhdGNoZXJIYW5kbGVyKiBtX2FnZW50IHsg bnVsbHB0ciB9OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgSW5zcGVjdG9yCkBAIC0yNDQsOSArMjQ0 LDYgQEAgUmVmPENvbW1hbmREb21haW5CYWNrZW5kRGlzcGF0Y2hlcj4gQ29tbWFuZERvbWFpbkJh Y2tlbmREaXNwYXRjaGVyOjpjcmVhdGUoQmFja2UKIENvbW1hbmREb21haW5CYWNrZW5kRGlzcGF0 Y2hlcjo6Q29tbWFuZERvbWFpbkJhY2tlbmREaXNwYXRjaGVyKEJhY2tlbmREaXNwYXRjaGVyJiBi YWNrZW5kRGlzcGF0Y2hlciwgQ29tbWFuZERvbWFpbkJhY2tlbmREaXNwYXRjaGVySGFuZGxlciog YWdlbnQpCiAgICAgOiBTdXBwbGVtZW50YWxCYWNrZW5kRGlzcGF0Y2hlcihiYWNrZW5kRGlzcGF0 Y2hlcikKICAgICAsIG1fYWdlbnQoYWdlbnQpCi0jaWYgRU5BQkxFKElOU1BFQ1RPUl9BTFRFUk5B VEVfRElTUEFUQ0hFUlMpCi0gICAgLCBtX2FsdGVybmF0ZURpc3BhdGNoZXIobnVsbHB0cikKLSNl bmRpZgogewogICAgIG1fYmFja2VuZERpc3BhdGNoZXItPnJlZ2lzdGVyRGlzcGF0Y2hlckZvckRv bWFpbihBU0NJSUxpdGVyYWwoIkNvbW1hbmREb21haW4iKSwgdGhpcyk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQv Z2VuZXJhdGUtZG9tYWlucy13aXRoLWZlYXR1cmUtZ3VhcmRzLmpzb24tcmVzdWx0IGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2dlbmVyYXRl LWRvbWFpbnMtd2l0aC1mZWF0dXJlLWd1YXJkcy5qc29uLXJlc3VsdAppbmRleCAzZTg0NDMxZTlh MjQ1YTJmYWI2NDM2NGI2YzRkODhmNmZmZWFlYzIyLi4yYjEyZjkxZDBiMjg4YmYyMGU2YjMzNTNk Zjk3NTY5YTc1NmVmYmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQvZ2VuZXJhdGUtZG9tYWlucy13aXRoLWZlYXR1cmUt Z3VhcmRzLmpzb24tcmVzdWx0CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv c2NyaXB0cy90ZXN0cy9leHBlY3RlZC9nZW5lcmF0ZS1kb21haW5zLXdpdGgtZmVhdHVyZS1ndWFy ZHMuanNvbi1yZXN1bHQKQEAgLTE2OSwxNSArMTY5LDE1IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgZGlzcGF0Y2gobG9uZyByZXF1ZXN0SWQsIGNvbnN0IFN0cmluZyYgbWV0aG9kLCBSZWY8 SW5zcGVjdG9yT2JqZWN0PiYmIG1lc3NhZ2UpIG92ZXJyaWRlOwogcHJpdmF0ZToKICAgICB2b2lk IGxvYWRSZXNvdXJjZShsb25nIHJlcXVlc3RJZCwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mJiBw YXJhbWV0ZXJzKTsKLXByaXZhdGU6Ci0gICAgTmV0d29yazFCYWNrZW5kRGlzcGF0Y2hlcihCYWNr ZW5kRGlzcGF0Y2hlciYsIE5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXJIYW5kbGVyKik7Ci0gICAg TmV0d29yazFCYWNrZW5kRGlzcGF0Y2hlckhhbmRsZXIqIG1fYWdlbnQ7CiAjaWYgRU5BQkxFKElO U1BFQ1RPUl9BTFRFUk5BVEVfRElTUEFUQ0hFUlMpCiBwdWJsaWM6CiAgICAgdm9pZCBzZXRBbHRl cm5hdGVEaXNwYXRjaGVyKEFsdGVybmF0ZU5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXIqIGFsdGVy bmF0ZURpc3BhdGNoZXIpIHsgbV9hbHRlcm5hdGVEaXNwYXRjaGVyID0gYWx0ZXJuYXRlRGlzcGF0 Y2hlcjsgfQogcHJpdmF0ZToKLSAgICBBbHRlcm5hdGVOZXR3b3JrMUJhY2tlbmREaXNwYXRjaGVy KiBtX2FsdGVybmF0ZURpc3BhdGNoZXI7CisgICAgQWx0ZXJuYXRlTmV0d29yazFCYWNrZW5kRGlz cGF0Y2hlciogbV9hbHRlcm5hdGVEaXNwYXRjaGVyIHsgbnVsbHB0ciB9OwogI2VuZGlmCitwcml2 YXRlOgorICAgIE5ldHdvcmsxQmFja2VuZERpc3BhdGNoZXIoQmFja2VuZERpc3BhdGNoZXImLCBO ZXR3b3JrMUJhY2tlbmREaXNwYXRjaGVySGFuZGxlciopOworICAgIE5ldHdvcmsxQmFja2VuZERp c3BhdGNoZXJIYW5kbGVyKiBtX2FnZW50IHsgbnVsbHB0ciB9OwogfTsKICNlbmRpZiAvLyBQTEFU Rk9STShXRUJfQ09NTUFORFMpCiAKQEAgLTI0NCw5ICsyNDQsNiBAQCBSZWY8TmV0d29yazFCYWNr ZW5kRGlzcGF0Y2hlcj4gTmV0d29yazFCYWNrZW5kRGlzcGF0Y2hlcjo6Y3JlYXRlKEJhY2tlbmRE aXNwYXRjaAogTmV0d29yazFCYWNrZW5kRGlzcGF0Y2hlcjo6TmV0d29yazFCYWNrZW5kRGlzcGF0 Y2hlcihCYWNrZW5kRGlzcGF0Y2hlciYgYmFja2VuZERpc3BhdGNoZXIsIE5ldHdvcmsxQmFja2Vu ZERpc3BhdGNoZXJIYW5kbGVyKiBhZ2VudCkKICAgICA6IFN1cHBsZW1lbnRhbEJhY2tlbmREaXNw YXRjaGVyKGJhY2tlbmREaXNwYXRjaGVyKQogICAgICwgbV9hZ2VudChhZ2VudCkKLSNpZiBFTkFC TEUoSU5TUEVDVE9SX0FMVEVSTkFURV9ESVNQQVRDSEVSUykKLSAgICAsIG1fYWx0ZXJuYXRlRGlz cGF0Y2hlcihudWxscHRyKQotI2VuZGlmCiB7CiAgICAgbV9iYWNrZW5kRGlzcGF0Y2hlci0+cmVn aXN0ZXJEaXNwYXRjaGVyRm9yRG9tYWluKEFTQ0lJTGl0ZXJhbCgiTmV0d29yazEiKSwgdGhpcyk7 CiB9Cg==