20876 2008-09-15 22:08:29 -0700 REGRESSION (r36417, r36427): fast/js/exception-expression-offset.html fails 2008-09-17 23:22:08 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P1 Normal --- 1 zwarich zwarich mjs sam oldest_to_newest 91314 0 zwarich 2008-09-15 22:08:29 -0700 Recent changes to op_instanceof and op_construct in r36417 and r36427 mean that exception data is not correctly emitted for op_instanceof and op_construct. An op_get_by_id is emitted to get the prototype property ahead of time, but there is no exception data for these new opcodes. This shouldn't be too hard to fix: just make these opcodes use ThrowableSubExpressionData and emit the right information. 91574 1 23519 zwarich 2008-09-17 20:59:50 -0700 Created attachment 23519 Proposed patch for 'instanceof' case Here's a patch for the 'instanceof' case. The constructor case requires actual subexpression data, but I should be able to do it easily after figuring out this case. 91575 2 23520 zwarich 2008-09-17 21:00:36 -0700 Created attachment 23520 Proposed patch for 'instanceof' case Oops. Here is the version with the layout test changes as well. 91576 3 23520 oliver 2008-09-17 21:07:43 -0700 Comment on attachment 23520 Proposed patch for 'instanceof' case r- as this reduces the fidelity of the error messages, and the error range no longer covers the entire instanceof 91581 4 23521 zwarich 2008-09-17 22:54:35 -0700 Created attachment 23521 Proposed patch This patch fixes both cases, and it does not change any of the exception information at all. 91582 5 23521 mjs 2008-09-17 23:16:36 -0700 Comment on attachment 23521 Proposed patch r=me 91583 6 zwarich 2008-09-17 23:22:08 -0700 Landed in r36604. 23519 2008-09-17 20:59:50 -0700 2008-09-17 21:00:36 -0700 Proposed patch for 'instanceof' case instanceof.diff text/plain 1296 zwarich SW5kZXg6IGtqcy9ub2Rlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2pzL25vZGVzLmNwcAkocmV2aXNp b24gMzY1NjMpCisrKyBranMvbm9kZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OTgsNyArNzk4 LDE2IEBAIFJlZ2lzdGVySUQqIEluc3RhbmNlT2ZOb2RlOjplbWl0Q29kZShDb2QKIHsKICAgICBS ZWZQdHI8UmVnaXN0ZXJJRD4gc3JjMSA9IGdlbmVyYXRvci5lbWl0Tm9kZUZvckxlZnRIYW5kU2lk ZShtX2V4cHIxLmdldCgpLCBtX3JpZ2h0SGFzQXNzaWdubWVudHMsIG1fZXhwcjItPmlzUHVyZShn ZW5lcmF0b3IpKTsKICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gc3JjMiA9IGdlbmVyYXRvci5lbWl0 Tm9kZShtX2V4cHIyLmdldCgpKTsKKworICAgIC8vIFRoZSBvbmx5IGVycm9yIHRoYXQgY2FuIGJl IHRocm93biBieSBvcF9nZXRfYnlfaWQgaXMgYSAibm90IGFuIG9iamVjdCIKKyAgICAvLyBlcnJv ci4gU2luY2UgbW9zdCBzdWJleHByZXNzaW9ucyB0aGF0IGNhdXNlIGEgIm5vdCBhbiBvYmplY3Qi IGVycm9yCisgICAgLy8gYXJlIG9uIHRoZSBsZWZ0IHNpZGUgb2YgYW4gZXhwcmVzc2lvbiAoZS5n LiBpbiBhIGRvdCBvciBicmFja2V0IG5vZGUpLAorICAgIC8vIGNyZWF0ZU5vdEFuT2JqZWN0RXJy b3IoKSBleHBlY3RzIHRoYXQgdGhlIHJhbmdlIG9mIHRoZSBlcnJvciBpcyBhbHdheXMKKyAgICAv LyBmcm9tIHRoZSBzdGFydCB0byB0aGUgZGl2b3QgYW5kIGlnbm9yZXMgdGhlIGVuZCBvZmZzZXQu IEhlbmNlIHdlIHVzZQorICAgIC8vIHRoZSBlbmQgb2YgdGhlIGVudGlyZSAnaW5zdGFuY2VvZicg ZXhwcmVzc2lvbiBhcyBhIGRpdm90LgorICAgIGdlbmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8o bV9kaXZvdCArIG1fZW5kT2Zmc2V0LCBtX2VuZE9mZnNldCwgMCk7CiAgICAgUmVnaXN0ZXJJRCog c3JjMlByb3RvdHlwZSA9IGdlbmVyYXRvci5lbWl0R2V0QnlJZChnZW5lcmF0b3IubmV3VGVtcG9y YXJ5KCksIHNyYzIuZ2V0KCksIGdlbmVyYXRvci5nbG9iYWxFeGVjKCktPnByb3BlcnR5TmFtZXMo KS5wcm90b3R5cGUpOworCiAgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNzaW9uSW5mbyhtX2Rpdm90 LCBtX3N0YXJ0T2Zmc2V0LCBtX2VuZE9mZnNldCk7CiAgICAgcmV0dXJuIGdlbmVyYXRvci5lbWl0 SW5zdGFuY2VPZihnZW5lcmF0b3IuZmluYWxEZXN0aW5hdGlvbihkc3QsIHNyYzEuZ2V0KCkpLCBz cmMxLmdldCgpLCBzcmMyLmdldCgpLCBzcmMyUHJvdG90eXBlKTsKIH0K 23520 2008-09-17 21:00:36 -0700 2008-09-17 22:54:35 -0700 Proposed patch for 'instanceof' case instanceof.diff text/plain 5302 zwarich SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM2NTk4KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDgtMDktMTcgIENhbWVyb24g WndhcmljaCAgPGN3endhcmljaEB1d2F0ZXJsb28uY2E+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDIwODc2OiBSRUdSRVNTSU9OIChyMzY0MTcs IHIzNjQyNyk6IGZhc3QvanMvZXhjZXB0aW9uLWV4cHJlc3Npb24tb2Zmc2V0Lmh0bWwgZmFpbHMK KyAgICAgICAgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg3Nj4K KworICAgICAgICBFbWl0IGV4Y2VwdGlvbiBleHByZXNzaW9uIGluZm8gZm9yIHRoZSBnZXRfYnlf aWQgb3Bjb2RlIHRoYXQgaXMgbm93CisgICAgICAgIGVtaXR0ZWQgZm9yIGFuICdpbnN0YW5jZW9m JyBleHByZXNzaW9uIGFmdGVyIHIzNjQxNy4gVGhpcyBmaXhlcyB0aGUKKyAgICAgICAgJ2luc3Rh bmNlb2YnIGNhc2Ugb2YgZmFzdC9qcy9leGNlcHRpb24tZXhwcmVzc2lvbi1vZmZzZXQuaHRtbC4K KworICAgICAgICAqIGtqcy9ub2Rlcy5jcHA6CisgICAgICAgIChKU0M6Okluc3RhbmNlT2ZOb2Rl OjplbWl0Q29kZSk6CisKIDIwMDgtMDktMTcgIEdhdmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91 Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDog SmF2YVNjcmlwdENvcmUva2pzL25vZGVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29y ZS9ranMvbm9kZXMuY3BwCShyZXZpc2lvbiAzNjU2MykKKysrIEphdmFTY3JpcHRDb3JlL2tqcy9u b2Rlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc5OCw3ICs3OTgsMTYgQEAgUmVnaXN0ZXJJRCog SW5zdGFuY2VPZk5vZGU6OmVtaXRDb2RlKENvZAogewogICAgIFJlZlB0cjxSZWdpc3RlcklEPiBz cmMxID0gZ2VuZXJhdG9yLmVtaXROb2RlRm9yTGVmdEhhbmRTaWRlKG1fZXhwcjEuZ2V0KCksIG1f cmlnaHRIYXNBc3NpZ25tZW50cywgbV9leHByMi0+aXNQdXJlKGdlbmVyYXRvcikpOwogICAgIFJl ZlB0cjxSZWdpc3RlcklEPiBzcmMyID0gZ2VuZXJhdG9yLmVtaXROb2RlKG1fZXhwcjIuZ2V0KCkp OworCisgICAgLy8gVGhlIG9ubHkgZXJyb3IgdGhhdCBjYW4gYmUgdGhyb3duIGJ5IG9wX2dldF9i eV9pZCBpcyBhICJub3QgYW4gb2JqZWN0IgorICAgIC8vIGVycm9yLiBTaW5jZSBtb3N0IHN1YmV4 cHJlc3Npb25zIHRoYXQgY2F1c2UgYSAibm90IGFuIG9iamVjdCIgZXJyb3IKKyAgICAvLyBhcmUg b24gdGhlIGxlZnQgc2lkZSBvZiBhbiBleHByZXNzaW9uIChlLmcuIGluIGEgZG90IG9yIGJyYWNr ZXQgbm9kZSksCisgICAgLy8gY3JlYXRlTm90QW5PYmplY3RFcnJvcigpIGV4cGVjdHMgdGhhdCB0 aGUgcmFuZ2Ugb2YgdGhlIGVycm9yIGlzIGFsd2F5cworICAgIC8vIGZyb20gdGhlIHN0YXJ0IHRv IHRoZSBkaXZvdCBhbmQgaWdub3JlcyB0aGUgZW5kIG9mZnNldC4gSGVuY2Ugd2UgdXNlCisgICAg Ly8gdGhlIGVuZCBvZiB0aGUgZW50aXJlICdpbnN0YW5jZW9mJyBleHByZXNzaW9uIGFzIGEgZGl2 b3QuCisgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNzaW9uSW5mbyhtX2Rpdm90ICsgbV9lbmRPZmZz ZXQsIG1fZW5kT2Zmc2V0LCAwKTsKICAgICBSZWdpc3RlcklEKiBzcmMyUHJvdG90eXBlID0gZ2Vu ZXJhdG9yLmVtaXRHZXRCeUlkKGdlbmVyYXRvci5uZXdUZW1wb3JhcnkoKSwgc3JjMi5nZXQoKSwg Z2VuZXJhdG9yLmdsb2JhbEV4ZWMoKS0+cHJvcGVydHlOYW1lcygpLnByb3RvdHlwZSk7CisKICAg ICBnZW5lcmF0b3IuZW1pdEV4cHJlc3Npb25JbmZvKG1fZGl2b3QsIG1fc3RhcnRPZmZzZXQsIG1f ZW5kT2Zmc2V0KTsKICAgICByZXR1cm4gZ2VuZXJhdG9yLmVtaXRJbnN0YW5jZU9mKGdlbmVyYXRv ci5maW5hbERlc3RpbmF0aW9uKGRzdCwgc3JjMS5nZXQoKSksIHNyYzEuZ2V0KCksIHNyYzIuZ2V0 KCksIHNyYzJQcm90b3R5cGUpOwogfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMzY1OTgpCisrKyBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBAQAorMjAwOC0w OS0xNyAgQ2FtZXJvbiBad2FyaWNoICA8Y3d6d2FyaWNoQHV3YXRlcmxvby5jYT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBCdWcgMjA4NzY6IFJFR1JF U1NJT04gKHIzNjQxNywgcjM2NDI3KTogZmFzdC9qcy9leGNlcHRpb24tZXhwcmVzc2lvbi1vZmZz ZXQuaHRtbCBmYWlscworICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwODc2PgorCisgICAgICAgIENoYW5nZSB0aGUgZXhwZWN0ZWQgcmVzdWx0cyBmb3Ig ZmFzdC9qcy9leGNlcHRpb24tZXhwcmVzc2lvbi1vZmZzZXQgdG8KKyAgICAgICAgbWF0Y2ggY2hh bmdlcyBpbiByMzY0MTcuCisKKyAgICAgICAgKiBmYXN0L2pzL2V4Y2VwdGlvbi1leHByZXNzaW9u LW9mZnNldC1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9qcy9yZXNvdXJjZXMvZXhjZXB0 aW9uLWV4cHJlc3Npb24tb2Zmc2V0LmpzOgorCiAyMDA4LTA5LTE3ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBwaXhlbCB0ZXN0IGV4cGVjdGVk IHZhbHVlcyBmb3IgdHJhbnNmb3JtIHRlc3RzLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9qcy9l eGNlcHRpb24tZXhwcmVzc2lvbi1vZmZzZXQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvanMvZXhjZXB0aW9uLWV4cHJlc3Npb24tb2Zmc2V0LWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMzY1NjMpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2pzL2V4Y2VwdGlvbi1leHBy ZXNzaW9uLW9mZnNldC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTEwMSwxMCArMTAx LDEwIEBAIFBBU1MgZXguZXhwcmVzc2lvbkVuZE9mZnNldCA9PSAxNCBpcyB0cnUKIFBBU1MgZXgu bWVzc2FnZSA9PSAiUmVzdWx0IG9mIGV4cHJlc3Npb24gJ3VuZGVmaW5lZCcgW3VuZGVmaW5lZF0g aXMgbm90IGEgdmFsaWQgYXJndW1lbnQgZm9yICdpbicuIiBpcyB0cnVlCiAKIFRlc3RpbmcgJzEg aW5zdGFuY2VvZiB1bmRlZmluZWQnCi1QQVNTIGV4LmV4cHJlc3Npb25CZWdpbk9mZnNldCA9PSAw IGlzIHRydWUKLVBBU1MgZXguZXhwcmVzc2lvbkNhcmV0T2Zmc2V0ID09IDEzIGlzIHRydWUKK1BB U1MgZXguZXhwcmVzc2lvbkJlZ2luT2Zmc2V0ID09IDEzIGlzIHRydWUKK1BBU1MgZXguZXhwcmVz c2lvbkNhcmV0T2Zmc2V0ID09IDIyIGlzIHRydWUKIFBBU1MgZXguZXhwcmVzc2lvbkVuZE9mZnNl dCA9PSAyMiBpcyB0cnVlCi1QQVNTIGV4Lm1lc3NhZ2UgPT0gIlJlc3VsdCBvZiBleHByZXNzaW9u ICd1bmRlZmluZWQnIFt1bmRlZmluZWRdIGlzIG5vdCBhIHZhbGlkIGFyZ3VtZW50IGZvciAnaW5z dGFuY2VvZicuIiBpcyB0cnVlCitQQVNTIGV4Lm1lc3NhZ2UgPT0gIlJlc3VsdCBvZiBleHByZXNz aW9uICd1bmRlZmluZWQnIFt1bmRlZmluZWRdIGlzIG5vdCBhbiBvYmplY3QuIiBpcyB0cnVlCiAK IFRlc3RpbmcgJ2ZvciAodW5kZWZpbmVkLmIgaW4gWzFdKSB7fScKIFBBU1MgZXguZXhwcmVzc2lv bkJlZ2luT2Zmc2V0ID09IDUgaXMgdHJ1ZQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9qcy9yZXNv dXJjZXMvZXhjZXB0aW9uLWV4cHJlc3Npb24tb2Zmc2V0LmpzCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2Zhc3QvanMvcmVzb3VyY2VzL2V4Y2VwdGlvbi1leHByZXNzaW9uLW9mZnNldC5qcwko cmV2aXNpb24gMzY1NjMpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2pzL3Jlc291cmNlcy9leGNlcHRp b24tZXhwcmVzc2lvbi1vZmZzZXQuanMJKHdvcmtpbmcgY29weSkKQEAgLTMxLDcgKzMxLDcgQEAg dGVzdEV4Y2VwdGlvbigiMSgpIiwgMCwgMSwgMywgIlJlc3VsdCBvZgogdGVzdEV4Y2VwdGlvbigi bmV3IDEoKSIsIDAsIDUsIDcsICJSZXN1bHQgb2YgZXhwcmVzc2lvbiAnMScgWzFdIGlzIG5vdCBh IGNvbnN0cnVjdG9yLiIpOwogdGVzdEV4Y2VwdGlvbigidGhyb3cgeyBtZXNzYWdlIDogJ3Rocm93 biBvYmplY3QnIH0iLCAwLCB1bmRlZmluZWQsIDM1LCAidGhyb3duIG9iamVjdCIpOwogdGVzdEV4 Y2VwdGlvbigiMSBpbiB1bmRlZmluZWQiLCAwLCA1LCAxNCwgIlJlc3VsdCBvZiBleHByZXNzaW9u ICd1bmRlZmluZWQnIFt1bmRlZmluZWRdIGlzIG5vdCBhIHZhbGlkIGFyZ3VtZW50IGZvciAnaW4n LiIpOwotdGVzdEV4Y2VwdGlvbigiMSBpbnN0YW5jZW9mIHVuZGVmaW5lZCIsIDAsIDEzLCAyMiwg IlJlc3VsdCBvZiBleHByZXNzaW9uICd1bmRlZmluZWQnIFt1bmRlZmluZWRdIGlzIG5vdCBhIHZh bGlkIGFyZ3VtZW50IGZvciAnaW5zdGFuY2VvZicuIik7Cit0ZXN0RXhjZXB0aW9uKCIxIGluc3Rh bmNlb2YgdW5kZWZpbmVkIiwgMTMsIDIyLCAyMiwgIlJlc3VsdCBvZiBleHByZXNzaW9uICd1bmRl ZmluZWQnIFt1bmRlZmluZWRdIGlzIG5vdCBhbiBvYmplY3QuIik7CiB0ZXN0RXhjZXB0aW9uKCJm b3IgKHVuZGVmaW5lZC5iIGluIFsxXSkge30iLCA1LCAxNCwgMTYsICJSZXN1bHQgb2YgZXhwcmVz c2lvbiAndW5kZWZpbmVkJyBbdW5kZWZpbmVkXSBpcyBub3QgYW4gb2JqZWN0LiIpOwogdGVzdEV4 Y2VwdGlvbigiZm9yICh1bmRlZmluZWRbMF0gaW4gWzFdKSB7fSIsIDUsIDE0LCAxNywgIlJlc3Vs dCBvZiBleHByZXNzaW9uICd1bmRlZmluZWQnIFt1bmRlZmluZWRdIGlzIG5vdCBhbiBvYmplY3Qu Iik7CiB0ZXN0RXhjZXB0aW9uKCJ1bmRlZmluZWQuYSA9IDUiLCAwLCA5LCAxNSwgIlJlc3VsdCBv ZiBleHByZXNzaW9uICd1bmRlZmluZWQnIFt1bmRlZmluZWRdIGlzIG5vdCBhbiBvYmplY3QuIik7 Cg== 23521 2008-09-17 22:54:35 -0700 2008-09-17 23:16:36 -0700 Proposed patch exceptions.diff text/plain 9777 zwarich SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDM2NjAy KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMDgtMDkt MTcgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1d2F0ZXJsb28uY2E+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDIwODc2OiBSRUdSRVNT SU9OIChyMzY0MTcsIHIzNjQyNyk6IGZhc3QvanMvZXhjZXB0aW9uLWV4cHJlc3Npb24tb2Zmc2V0 Lmh0bWwgZmFpbHMKKyAgICAgICAgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDg3Nj4KKworICAgICAgICByMzY0MTcgYW5kIHIzNjQyNyBjYXVzZWQgYW4gZ2V0X2J5 X2lkIG9wY29kZSB0byBiZSBlbWl0dGVkIGJlZm9yZSB0aGUKKyAgICAgICAgaW5zdGFuY2VvZiBh bmQgY29uc3RydWN0IG9wY29kZXMsIGluIG9yZGVyIHRvIGVuYWJsZSBpbmxpbmUgY2FjaGluZyBv ZgorICAgICAgICB0aGUgcHJvdG90eXBlIHByb3BlcnR5LiBVbmZvcnR1bmF0ZWx5LCB0aGlzIHJl Z3Jlc3NlZCBzb21lIHRlc3RzIGRlYWxpbmcKKyAgICAgICAgd2l0aCBleGNlcHRpb25zIHRocm93 biBieSAnaW5zdGFuY2VvZicgYW5kIHRoZSAnbmV3JyBvcGVyYXRvci4gV2UgZml4CisgICAgICAg IHRoZXNlIHByb2JsZW1zIGJ5IGRldGVjdGluZyB3aGV0aGVyIGFuICJpcyBub3QgYW4gb2JqZWN0 IiBleGNlcHRpb24gaXMKKyAgICAgICAgdGhyb3duIGJlZm9yZSBvcF9pbnN0YW5jZW9mIG9yIG9w X2NvbnN0cnVjdCwgYW5kIGVtaXQgdGhlIHByb3BlcgorICAgICAgICBleGNlcHRpb24gaW4gdGhv c2UgY2FzZXMuCisKKyAgICAgICAgKiBWTS9Db2RlR2VuZXJhdG9yLmNwcDoKKyAgICAgICAgKEpT Qzo6Q29kZUdlbmVyYXRvcjo6ZW1pdENvbnN0cnVjdCk6CisgICAgICAgICogVk0vQ29kZUdlbmVy YXRvci5oOgorICAgICAgICAqIFZNL0V4Y2VwdGlvbkhlbHBlcnMuY3BwOgorICAgICAgICAoSlND OjpjcmVhdGVJbnZhbGlkUGFyYW1FcnJvcik6CisgICAgICAgIChKU0M6OmNyZWF0ZU5vdEFDb25z dHJ1Y3RvckVycm9yKToKKyAgICAgICAgKEpTQzo6Y3JlYXRlTm90QW5PYmplY3RFcnJvcik6Cisg ICAgICAgICogVk0vRXhjZXB0aW9uSGVscGVycy5oOgorICAgICAgICAqIFZNL01hY2hpbmUuY3Bw OgorICAgICAgICAoSlNDOjpNYWNoaW5lOjpnZXRPcGNvZGUpOgorICAgICAgICAoSlNDOjpNYWNo aW5lOjpwcml2YXRlRXhlY3V0ZSk6CisgICAgICAgICogVk0vTWFjaGluZS5oOgorICAgICAgICAq IGtqcy9ub2Rlcy5jcHA6CisgICAgICAgIChKU0M6Ok5ld0V4cHJOb2RlOjplbWl0Q29kZSk6Cisg ICAgICAgIChKU0M6Okluc3RhbmNlT2ZOb2RlOjplbWl0Q29kZSk6CisKIDIwMDgtMDktMTcgIEdh dmluIEJhcnJhY2xvdWdoICA8YmFycmFjbG91Z2hAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogVk0vQ29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVk0vQ29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDM2NTYzKQorKysgVk0vQ29kZUdl bmVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMDksNyArMTEwOSw3IEBAIFJlZ2lzdGVy SUQqIENvZGVHZW5lcmF0b3I6OmVtaXRVbmFyeU5vRHMKICAgICByZXR1cm4gc3JjOwogfQogCi1S ZWdpc3RlcklEKiBDb2RlR2VuZXJhdG9yOjplbWl0Q29uc3RydWN0KFJlZ2lzdGVySUQqIGRzdCwg UmVnaXN0ZXJJRCogZnVuYywgQXJndW1lbnRzTm9kZSogYXJndW1lbnRzTm9kZSkKK1JlZ2lzdGVy SUQqIENvZGVHZW5lcmF0b3I6OmVtaXRDb25zdHJ1Y3QoUmVnaXN0ZXJJRCogZHN0LCBSZWdpc3Rl cklEKiBmdW5jLCBBcmd1bWVudHNOb2RlKiBhcmd1bWVudHNOb2RlLCB1bnNpZ25lZCBkaXZvdCwg dW5zaWduZWQgc3RhcnRPZmZzZXQsIHVuc2lnbmVkIGVuZE9mZnNldCkKIHsKICAgICBBU1NFUlQo ZnVuYy0+cmVmQ291bnQoKSk7CiAKQEAgLTExMjksOCArMTEyOSwxMCBAQCBSZWdpc3RlcklEKiBD b2RlR2VuZXJhdG9yOjplbWl0Q29uc3RydWN0CiAgICAgICAgIGVtaXROb2RlKGFyZ3YubGFzdCgp LmdldCgpLCBuKTsKICAgICB9CiAKKyAgICBlbWl0RXhwcmVzc2lvbkluZm8oZGl2b3QsIHN0YXJ0 T2Zmc2V0LCBlbmRPZmZzZXQpOwogICAgIGVtaXRHZXRCeUlkKGZ1bmNQcm90by5nZXQoKSwgZnVu YywgZ2xvYmFsRXhlYygpLT5wcm9wZXJ0eU5hbWVzKCkucHJvdG90eXBlKTsKIAorICAgIGVtaXRF eHByZXNzaW9uSW5mbyhkaXZvdCwgc3RhcnRPZmZzZXQsIGVuZE9mZnNldCk7CiAgICAgZW1pdE9w Y29kZShvcF9jb25zdHJ1Y3QpOwogICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChkc3QtPmluZGV4 KCkpOwogICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChmdW5jLT5pbmRleCgpKTsKSW5kZXg6IFZN L0NvZGVHZW5lcmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBWTS9Db2RlR2VuZXJhdG9yLmgJKHJldmlz aW9uIDM2NTYzKQorKysgVk0vQ29kZUdlbmVyYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yODAs NyArMjgwLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIFJlZ2lzdGVySUQqIGVtaXRSZXR1 cm4oUmVnaXN0ZXJJRCogc3JjKSB7IHJldHVybiBlbWl0VW5hcnlOb0RzdE9wKG9wX3JldCwgc3Jj KTsgfSAKICAgICAgICAgUmVnaXN0ZXJJRCogZW1pdEVuZChSZWdpc3RlcklEKiBzcmMpIHsgcmV0 dXJuIGVtaXRVbmFyeU5vRHN0T3Aob3BfZW5kLCBzcmMpOyB9CiAKLSAgICAgICAgUmVnaXN0ZXJJ RCogZW1pdENvbnN0cnVjdChSZWdpc3RlcklEKiBkc3QsIFJlZ2lzdGVySUQqIGZ1bmMsIEFyZ3Vt ZW50c05vZGUqKTsKKyAgICAgICAgUmVnaXN0ZXJJRCogZW1pdENvbnN0cnVjdChSZWdpc3RlcklE KiBkc3QsIFJlZ2lzdGVySUQqIGZ1bmMsIEFyZ3VtZW50c05vZGUqLCB1bnNpZ25lZCBkaXZvdCwg dW5zaWduZWQgc3RhcnRPZmZzZXQsIHVuc2lnbmVkIGVuZE9mZnNldCk7CiAKICAgICAgICAgUGFz c1JlZlB0cjxMYWJlbElEPiBlbWl0TGFiZWwoTGFiZWxJRCopOwogICAgICAgICBQYXNzUmVmUHRy PExhYmVsSUQ+IGVtaXRKdW1wKExhYmVsSUQqIHRhcmdldCk7CkluZGV4OiBWTS9FeGNlcHRpb25I ZWxwZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBWTS9FeGNlcHRpb25IZWxwZXJzLmNwcAkocmV2aXNp b24gMzY1NjMpCisrKyBWTS9FeGNlcHRpb25IZWxwZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzEsOSArMzEsMTAgQEAKIAogI2luY2x1ZGUgIkNvZGVCbG9jay5oIgogI2luY2x1ZGUgIkV4ZWNT dGF0ZS5oIgotI2luY2x1ZGUgIm5vZGVzLmgiCiAjaW5jbHVkZSAiSlNPYmplY3QuaCIKICNpbmNs dWRlICJKU05vdEFuT2JqZWN0LmgiCisjaW5jbHVkZSAiTWFjaGluZS5oIgorI2luY2x1ZGUgIm5v ZGVzLmgiCiAKIG5hbWVzcGFjZSBKU0MgewogCkBAIC0xNDcsNyArMTQ4LDcgQEAgc3RhdGljIFVT dHJpbmcgY3JlYXRlRXJyb3JNZXNzYWdlKEV4ZWNTdAogICAgIHJldHVybiBlcnJvclRleHQ7CiB9 CiAKLUpTVmFsdWUqIGNyZWF0ZUludmFsaWRQYXJhbUVycm9yKEV4ZWNTdGF0ZSogZXhlYywgY29u c3QgY2hhciogb3AsIEpTVmFsdWUqIHZhbHVlLCBjb25zdCBJbnN0cnVjdGlvbiogdlBDLCBDb2Rl QmxvY2sqIGNvZGVCbG9jaykKK0pTT2JqZWN0KiBjcmVhdGVJbnZhbGlkUGFyYW1FcnJvcihFeGVj U3RhdGUqIGV4ZWMsIGNvbnN0IGNoYXIqIG9wLCBKU1ZhbHVlKiB2YWx1ZSwgY29uc3QgSW5zdHJ1 Y3Rpb24qIHZQQywgQ29kZUJsb2NrKiBjb2RlQmxvY2spCiB7CiAgICAgVVN0cmluZyBtZXNzYWdl ID0gIm5vdCBhIHZhbGlkIGFyZ3VtZW50IGZvciAnIjsKICAgICBtZXNzYWdlLmFwcGVuZChvcCk7 CkBAIC0xNjUsNyArMTY2LDcgQEAgSlNWYWx1ZSogY3JlYXRlSW52YWxpZFBhcmFtRXJyb3IoRXhl Y1N0YQogICAgIHJldHVybiBleGNlcHRpb247CiB9CiAKLUpTVmFsdWUqIGNyZWF0ZU5vdEFDb25z dHJ1Y3RvckVycm9yKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSogdmFsdWUsIGNvbnN0IEluc3Ry dWN0aW9uKiB2UEMsIENvZGVCbG9jayogY29kZUJsb2NrKQorSlNPYmplY3QqIGNyZWF0ZU5vdEFD b25zdHJ1Y3RvckVycm9yKEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSogdmFsdWUsIGNvbnN0IElu c3RydWN0aW9uKiB2UEMsIENvZGVCbG9jayogY29kZUJsb2NrKQogewogICAgIGludCBzdGFydE9m ZnNldCA9IDA7CiAgICAgaW50IGVuZE9mZnNldCA9IDA7CkBAIC0yMDcsNiArMjA4LDExIEBAIEpT Tm90QW5PYmplY3RFcnJvclN0dWIqIGNyZWF0ZU5vdEFuT2JqZWMKIAogSlNPYmplY3QqIGNyZWF0 ZU5vdEFuT2JqZWN0RXJyb3IoRXhlY1N0YXRlKiBleGVjLCBKU05vdEFuT2JqZWN0RXJyb3JTdHVi KiBlcnJvciwgY29uc3QgSW5zdHJ1Y3Rpb24qIHZQQywgQ29kZUJsb2NrKiBjb2RlQmxvY2spCiB7 CisgICAgaWYgKHZQQ1s4XS51Lm9wY29kZSA9PSBNYWNoaW5lOjpnZXRPcGNvZGUob3BfaW5zdGFu Y2VvZikpCisgICAgICAgIHJldHVybiBjcmVhdGVJbnZhbGlkUGFyYW1FcnJvcihleGVjLCAiaW5z dGFuY2VvZiIsIGVycm9yLT5pc051bGwoKSA/IGpzTnVsbCgpIDoganNVbmRlZmluZWQoKSwgdlBD LCBjb2RlQmxvY2spOworICAgIGlmICh2UENbOF0udS5vcGNvZGUgPT0gTWFjaGluZTo6Z2V0T3Bj b2RlKG9wX2NvbnN0cnVjdCkpCisgICAgICAgIHJldHVybiBjcmVhdGVOb3RBQ29uc3RydWN0b3JF cnJvcihleGVjLCBlcnJvci0+aXNOdWxsKCkgPyBqc051bGwoKSA6IGpzVW5kZWZpbmVkKCksIHZQ QywgY29kZUJsb2NrKTsKKwogICAgIGludCBzdGFydE9mZnNldCA9IDA7CiAgICAgaW50IGVuZE9m ZnNldCA9IDA7CiAgICAgaW50IGRpdm90UG9pbnQgPSAwOwpJbmRleDogVk0vRXhjZXB0aW9uSGVs cGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFZNL0V4Y2VwdGlvbkhlbHBlcnMuaAkocmV2aXNpb24gMzY1 NjMpCisrKyBWTS9FeGNlcHRpb25IZWxwZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDggKzQy LDggQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgSlNWYWx1ZSogY3JlYXRlU3RhY2tPdmVyZmxvd0Vy cm9yKEV4ZWNTdGF0ZSopOwogICAgIEpTVmFsdWUqIGNyZWF0ZVVuZGVmaW5lZFZhcmlhYmxlRXJy b3IoRXhlY1N0YXRlKiwgY29uc3QgSWRlbnRpZmllciYsIGNvbnN0IEluc3RydWN0aW9uKiwgQ29k ZUJsb2NrKik7CiAgICAgSlNOb3RBbk9iamVjdEVycm9yU3R1YiogY3JlYXRlTm90QW5PYmplY3RF cnJvclN0dWIoRXhlY1N0YXRlKiwgYm9vbCBpc051bGwpOwotICAgIEpTVmFsdWUqIGNyZWF0ZUlu dmFsaWRQYXJhbUVycm9yKEV4ZWNTdGF0ZSosIGNvbnN0IGNoYXIqIG9wLCBKU1ZhbHVlKiwgY29u c3QgSW5zdHJ1Y3Rpb24qLCBDb2RlQmxvY2sqKTsKLSAgICBKU1ZhbHVlKiBjcmVhdGVOb3RBQ29u c3RydWN0b3JFcnJvcihFeGVjU3RhdGUqLCBKU1ZhbHVlKiwgY29uc3QgSW5zdHJ1Y3Rpb24qLCBD b2RlQmxvY2sqKTsKKyAgICBKU09iamVjdCogY3JlYXRlSW52YWxpZFBhcmFtRXJyb3IoRXhlY1N0 YXRlKiwgY29uc3QgY2hhciogb3AsIEpTVmFsdWUqLCBjb25zdCBJbnN0cnVjdGlvbiosIENvZGVC bG9jayopOworICAgIEpTT2JqZWN0KiBjcmVhdGVOb3RBQ29uc3RydWN0b3JFcnJvcihFeGVjU3Rh dGUqLCBKU1ZhbHVlKiwgY29uc3QgSW5zdHJ1Y3Rpb24qLCBDb2RlQmxvY2sqKTsKICAgICBKU1Zh bHVlKiBjcmVhdGVOb3RBRnVuY3Rpb25FcnJvcihFeGVjU3RhdGUqLCBKU1ZhbHVlKiwgY29uc3Qg SW5zdHJ1Y3Rpb24qLCBDb2RlQmxvY2sqKTsKICAgICBKU09iamVjdCogY3JlYXRlTm90QW5PYmpl Y3RFcnJvcihFeGVjU3RhdGUqLCBKU05vdEFuT2JqZWN0RXJyb3JTdHViKiwgY29uc3QgSW5zdHJ1 Y3Rpb24qLCBDb2RlQmxvY2sqKTsKIApJbmRleDogVk0vTWFjaGluZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVk0vTWFjaGluZS5jcHAJKHJldmlzaW9uIDM2NTYzKQorKysgVk0vTWFjaGluZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTQ3Nyw2ICs0NzcsMTkgQEAgc3RhdGljIGJvb2wgTkVWRVJfSU5MSU5F IHJlc29sdmVCYXNlQW5kRgogICAgIHJldHVybiBmYWxzZTsKIH0KIAorI2lmIEhBVkUoQ09NUFVU RURfR09UTykKK09wY29kZSBNYWNoaW5lOjpzX29wY29kZVRhYmxlW251bU9wY29kZUlEc107Cisj ZW5kaWYKKworT3Bjb2RlIE1hY2hpbmU6OmdldE9wY29kZShPcGNvZGVJRCBpZCkKK3sKKyAgICAj aWYgSEFWRShDT01QVVRFRF9HT1RPKQorICAgICAgICByZXR1cm4gc19vcGNvZGVUYWJsZVtpZF07 CisgICAgI2Vsc2UKKyAgICAgICAgcmV0dXJuIGlkOworICAgICNlbmRpZgorfQorCiBBTFdBWVNf SU5MSU5FIHZvaWQgTWFjaGluZTo6aW5pdGlhbGl6ZUNhbGxGcmFtZShSZWdpc3RlciogY2FsbEZy YW1lLCBDb2RlQmxvY2sqIGNvZGVCbG9jaywgSW5zdHJ1Y3Rpb24qIHZQQywgU2NvcGVDaGFpbk5v ZGUqIHNjb3BlQ2hhaW4sIFJlZ2lzdGVyKiByLCBpbnQgcmV0dXJuVmFsdWVSZWdpc3RlciwgaW50 IGFyZ3YsIGludCBhcmdjLCBKU1ZhbHVlKiBmdW5jdGlvbikKIHsKICAgICBjYWxsRnJhbWVbUmVn aXN0ZXJGaWxlOjpDYWxsZXJDb2RlQmxvY2tdID0gY29kZUJsb2NrOwpAQCAtMTM4Nyw3ICsxNDAw LDcgQEAgSlNWYWx1ZSogTWFjaGluZTo6cHJpdmF0ZUV4ZWN1dGUoRXhlY3V0aQogICAgIC8vIGhl cmUgYmVjYXVzZSBvdXIgbGFiZWxzIGFyZSBvbmx5IGluIHNjb3BlIGluc2lkZSB0aGlzIGZ1bmN0 aW9uLgogICAgIGlmIChmbGFnID09IEluaXRpYWxpemVBbmRSZXR1cm4pIHsKICAgICAgICAgI2lm IEhBVkUoQ09NUFVURURfR09UTykKLSAgICAgICAgICAgICNkZWZpbmUgQUREX09QQ09ERShpZCkg bV9vcGNvZGVUYWJsZVtpZF0gPSAmJmlkOworICAgICAgICAgICAgI2RlZmluZSBBRERfT1BDT0RF KGlkKSBzX29wY29kZVRhYmxlW2lkXSA9ICYmaWQ7CiAgICAgICAgICAgICAgICAgRk9SX0VBQ0hf T1BDT0RFX0lEKEFERF9PUENPREUpOwogICAgICAgICAgICAgI3VuZGVmIEFERF9PUENPREUKIApJ bmRleDogVk0vTWFjaGluZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFZNL01hY2hpbmUuaAkocmV2aXNpb24g MzY1NjMpCisrKyBWTS9NYWNoaW5lLmgJKHdvcmtpbmcgY29weSkKQEAgLTc0LDE0ICs3NCw3IEBA IG5hbWVzcGFjZSBKU0MgewogICAgICAgICAKICAgICAgICAgUmVnaXN0ZXJGaWxlJiByZWdpc3Rl ckZpbGUoKSB7IHJldHVybiBtX3JlZ2lzdGVyRmlsZTsgfQogICAgICAgICAKLSAgICAgICAgT3Bj b2RlIGdldE9wY29kZShPcGNvZGVJRCBpZCkKLSAgICAgICAgewotICAgICAgICAgICAgI2lmIEhB VkUoQ09NUFVURURfR09UTykKLSAgICAgICAgICAgICAgICByZXR1cm4gbV9vcGNvZGVUYWJsZVtp ZF07Ci0gICAgICAgICAgICAjZWxzZQotICAgICAgICAgICAgICAgIHJldHVybiBpZDsKLSAgICAg ICAgICAgICNlbmRpZgotICAgICAgICB9CisgICAgICAgIHN0YXRpYyBPcGNvZGUgZ2V0T3Bjb2Rl KE9wY29kZUlEIGlkKTsKIAogICAgICAgICBPcGNvZGVJRCBnZXRPcGNvZGVJRChPcGNvZGUgb3Bj b2RlKQogICAgICAgICB7CkBAIC0zMDAsNyArMjkzLDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAg ICAgIHZvaWQqIG1fanNGdW5jdGlvblZwdHI7CiAKICNpZiBIQVZFKENPTVBVVEVEX0dPVE8pCi0g ICAgICAgIE9wY29kZSBtX29wY29kZVRhYmxlW251bU9wY29kZUlEc107IC8vIE1hcHMgT3Bjb2Rl SUQgPT4gT3Bjb2RlIGZvciBjb21waWxpbmcKKyAgICAgICAgc3RhdGljIE9wY29kZSBzX29wY29k ZVRhYmxlW251bU9wY29kZUlEc107IC8vIE1hcHMgT3Bjb2RlSUQgPT4gT3Bjb2RlIGZvciBjb21w aWxpbmcKICAgICAgICAgSGFzaE1hcDxPcGNvZGUsIE9wY29kZUlEPiBtX29wY29kZUlEVGFibGU7 IC8vIE1hcHMgT3Bjb2RlID0+IE9wY29kZUlEIGZvciBkZWNvbXBpbGluZwogI2VuZGlmCiAgICAg fTsKSW5kZXg6IGtqcy9ub2Rlcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2pzL25vZGVzLmNwcAkocmV2 aXNpb24gMzY1NjMpCisrKyBranMvbm9kZXMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MDcsOCAr NDA3LDcgQEAgUmVnaXN0ZXJJRCogQXJndW1lbnRMaXN0Tm9kZTo6ZW1pdENvZGUoQwogUmVnaXN0 ZXJJRCogTmV3RXhwck5vZGU6OmVtaXRDb2RlKENvZGVHZW5lcmF0b3ImIGdlbmVyYXRvciwgUmVn aXN0ZXJJRCogZHN0KQogewogICAgIFJlZlB0cjxSZWdpc3RlcklEPiByMCA9IGdlbmVyYXRvci5l bWl0Tm9kZShtX2V4cHIuZ2V0KCkpOwotICAgIGdlbmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8o bV9kaXZvdCwgbV9zdGFydE9mZnNldCwgbV9lbmRPZmZzZXQpOwotICAgIHJldHVybiBnZW5lcmF0 b3IuZW1pdENvbnN0cnVjdChnZW5lcmF0b3IuZmluYWxEZXN0aW5hdGlvbihkc3QsIHIwLmdldCgp KSwgcjAuZ2V0KCksIG1fYXJncy5nZXQoKSk7CisgICAgcmV0dXJuIGdlbmVyYXRvci5lbWl0Q29u c3RydWN0KGdlbmVyYXRvci5maW5hbERlc3RpbmF0aW9uKGRzdCwgcjAuZ2V0KCkpLCByMC5nZXQo KSwgbV9hcmdzLmdldCgpLCBtX2Rpdm90LCBtX3N0YXJ0T2Zmc2V0LCBtX2VuZE9mZnNldCk7CiB9 CiAKIFJlZ2lzdGVySUQqIEV2YWxGdW5jdGlvbkNhbGxOb2RlOjplbWl0Q29kZShDb2RlR2VuZXJh dG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGRzdCkKQEAgLTc5OCw3ICs3OTcsMTAgQEAgUmVn aXN0ZXJJRCogSW5zdGFuY2VPZk5vZGU6OmVtaXRDb2RlKENvZAogewogICAgIFJlZlB0cjxSZWdp c3RlcklEPiBzcmMxID0gZ2VuZXJhdG9yLmVtaXROb2RlRm9yTGVmdEhhbmRTaWRlKG1fZXhwcjEu Z2V0KCksIG1fcmlnaHRIYXNBc3NpZ25tZW50cywgbV9leHByMi0+aXNQdXJlKGdlbmVyYXRvcikp OwogICAgIFJlZlB0cjxSZWdpc3RlcklEPiBzcmMyID0gZ2VuZXJhdG9yLmVtaXROb2RlKG1fZXhw cjIuZ2V0KCkpOworCisgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNzaW9uSW5mbyhtX2Rpdm90LCBt X3N0YXJ0T2Zmc2V0LCBtX2VuZE9mZnNldCk7CiAgICAgUmVnaXN0ZXJJRCogc3JjMlByb3RvdHlw ZSA9IGdlbmVyYXRvci5lbWl0R2V0QnlJZChnZW5lcmF0b3IubmV3VGVtcG9yYXJ5KCksIHNyYzIu Z2V0KCksIGdlbmVyYXRvci5nbG9iYWxFeGVjKCktPnByb3BlcnR5TmFtZXMoKS5wcm90b3R5cGUp OworCiAgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNzaW9uSW5mbyhtX2Rpdm90LCBtX3N0YXJ0T2Zm c2V0LCBtX2VuZE9mZnNldCk7CiAgICAgcmV0dXJuIGdlbmVyYXRvci5lbWl0SW5zdGFuY2VPZihn ZW5lcmF0b3IuZmluYWxEZXN0aW5hdGlvbihkc3QsIHNyYzEuZ2V0KCkpLCBzcmMxLmdldCgpLCBz cmMyLmdldCgpLCBzcmMyUHJvdG90eXBlKTsKIH0K