70403 2011-10-19 01:34:37 -0700 bytecompiler sometimes generates incorrect bytecode for put_by_id 2011-10-21 02:10:40 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 zheng.z.liu webkit-unassigned barraclough dbates fpizlo ggaren oliver webkit.review.bot oldest_to_newest 486617 0 zheng.z.liu 2011-10-19 01:34:37 -0700 Bytecompiler sometimes generates incorrect bytecode for put_by_id. case:(a same case of dot) function f(a,i,j) { a.__defineSetter__('x', function(v) { this['z']=v; i='CLOBBERED'; }); j['y']=(a['x']=i); print(j.y); }; f({},'RVAL',{}); expected: 'RVAL', got: 'CLOBBERED' Reason: [ 34] mov r4, "y"(@k1) [ 37] put_by_val r-9, "x"(@k0), r-8 [ 41] put_by_val r3, r4, r-8 r-8 is clobbered in this case. Expression (a['x']=i) should not forward r-8. 486622 1 111577 zheng.z.liu 2011-10-19 01:46:32 -0700 Created attachment 111577 A simple patch to copy the rvalue before put. 486691 2 111596 zheng.z.liu 2011-10-19 05:16:44 -0700 Created attachment 111596 Fix Don't copy when the result is to be ignored. 488081 3 111888 zheng.z.liu 2011-10-20 19:03:04 -0700 Created attachment 111888 Correct format. 488103 4 111891 zheng.z.liu 2011-10-20 19:52:12 -0700 Created attachment 111891 Fix ChangeLog 488148 5 fpizlo 2011-10-20 21:46:00 -0700 Great catch! Took me a while to see what was going on. Can you add a LayoutTest and include it in this patch? 488177 6 111891 ggaren 2011-10-20 23:00:24 -0700 Comment on attachment 111891 Fix ChangeLog r-, but this patch looks ready to go once it has a layout test. See http://www.webkit.org/quality/testwriting.html. 488244 7 111919 zheng.z.liu 2011-10-21 00:58:58 -0700 Created attachment 111919 Added test at LayoutTests/fast/js. 488245 8 111919 fpizlo 2011-10-21 00:59:47 -0700 Comment on attachment 111919 Added test at LayoutTests/fast/js. Looks great, r=me. 488277 9 111919 webkit.review.bot 2011-10-21 02:10:34 -0700 Comment on attachment 111919 Added test at LayoutTests/fast/js. Clearing flags on attachment: 111919 Committed r98091: <http://trac.webkit.org/changeset/98091> 488278 10 webkit.review.bot 2011-10-21 02:10:40 -0700 All reviewed patches have been landed. Closing bug. 111577 2011-10-19 01:46:32 -0700 2011-10-19 05:16:44 -0700 A simple patch to copy the rvalue before put. patch text/plain 1505 zheng.z.liu SW5kZXg6IE5vZGVzQ29kZWdlbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTm9kZXNDb2RlZ2VuLmNwcAko cmV2aXNpb24gOTc4MjEpCisrKyBOb2Rlc0NvZGVnZW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MjE2LDggKzEyMTYsOSBAQAogICAgIFJlZlB0cjxSZWdpc3RlcklEPiB2YWx1ZSA9IGdlbmVyYXRv ci5kZXN0aW5hdGlvbkZvckFzc2lnblJlc3VsdChkc3QpOwogICAgIFJlZ2lzdGVySUQqIHJlc3Vs dCA9IGdlbmVyYXRvci5lbWl0Tm9kZSh2YWx1ZS5nZXQoKSwgbV9yaWdodCk7CiAgICAgZ2VuZXJh dG9yLmVtaXRFeHByZXNzaW9uSW5mbyhkaXZvdCgpLCBzdGFydE9mZnNldCgpLCBlbmRPZmZzZXQo KSk7Ci0gICAgZ2VuZXJhdG9yLmVtaXRQdXRCeUlkKGJhc2UuZ2V0KCksIG1faWRlbnQsIHJlc3Vs dCk7Ci0gICAgcmV0dXJuIGdlbmVyYXRvci5tb3ZlVG9EZXN0aW5hdGlvbklmTmVlZGVkKGRzdCwg cmVzdWx0KTsKKyAgICBSZWdpc3RlcklEKiBmb3J3YXJkUmVzdWx0ID0gZ2VuZXJhdG9yLm1vdmVU b0Rlc3RpbmF0aW9uSWZOZWVkZWQoZ2VuZXJhdG9yLnRlbXBEZXN0aW5hdGlvbihyZXN1bHQpLCBy ZXN1bHQpOworICAgIGdlbmVyYXRvci5lbWl0UHV0QnlJZChiYXNlLmdldCgpLCBtX2lkZW50LCBm b3J3YXJkUmVzdWx0KTsKKyAgICByZXR1cm4gZ2VuZXJhdG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZO ZWVkZWQoZHN0LCBmb3J3YXJkUmVzdWx0KTsKIH0KIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tIFJlYWRNb2RpZnlEb3ROb2RlIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCkBAIC0xMjUxLDggKzEyNTIsOSBAQAogICAgIFJlZ2lzdGVySUQqIHJlc3VsdCA9IGdl bmVyYXRvci5lbWl0Tm9kZSh2YWx1ZS5nZXQoKSwgbV9yaWdodCk7CiAKICAgICBnZW5lcmF0b3Iu ZW1pdEV4cHJlc3Npb25JbmZvKGRpdm90KCksIHN0YXJ0T2Zmc2V0KCksIGVuZE9mZnNldCgpKTsK LSAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5VmFsKGJhc2UuZ2V0KCksIHByb3BlcnR5LmdldCgpLCBy ZXN1bHQpOwotICAgIHJldHVybiBnZW5lcmF0b3IubW92ZVRvRGVzdGluYXRpb25JZk5lZWRlZChk c3QsIHJlc3VsdCk7CisgICAgUmVnaXN0ZXJJRCogZm9yd2FyZFJlc3VsdCA9IGdlbmVyYXRvci5t b3ZlVG9EZXN0aW5hdGlvbklmTmVlZGVkKGdlbmVyYXRvci50ZW1wRGVzdGluYXRpb24ocmVzdWx0 KSwgcmVzdWx0KTsKKyAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5VmFsKGJhc2UuZ2V0KCksIHByb3Bl cnR5LmdldCgpLCBmb3J3YXJkUmVzdWx0KTsKKyAgICByZXR1cm4gZ2VuZXJhdG9yLm1vdmVUb0Rl c3RpbmF0aW9uSWZOZWVkZWQoZHN0LCBmb3J3YXJkUmVzdWx0KTsKIH0KIAogLy8gLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tIFJlYWRNb2RpZnlCcmFja2V0Tm9kZSAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo= 111596 2011-10-19 05:16:44 -0700 2011-10-20 19:03:04 -0700 Fix patch text/plain 1610 zheng.z.liu LS0tIC4uLy4uLy4uLy4uL1dlYktpdC1yOTc2NjQuYmFrL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAkyMDExLTA5LTEzIDE2OjMzOjI4LjAwMDAwMDAw MCArMDgwMAorKysgTm9kZXNDb2RlZ2VuLmNwcAkyMDExLTEwLTE5IDE5OjU2OjAyLjYwNDI1ODc2 MSArMDgwMApAQCAtMTIxNiw4ICsxMjE2LDkgQEAKICAgICBSZWZQdHI8UmVnaXN0ZXJJRD4gdmFs dWUgPSBnZW5lcmF0b3IuZGVzdGluYXRpb25Gb3JBc3NpZ25SZXN1bHQoZHN0KTsKICAgICBSZWdp c3RlcklEKiByZXN1bHQgPSBnZW5lcmF0b3IuZW1pdE5vZGUodmFsdWUuZ2V0KCksIG1fcmlnaHQp OwogICAgIGdlbmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8oZGl2b3QoKSwgc3RhcnRPZmZzZXQo KSwgZW5kT2Zmc2V0KCkpOwotICAgIGdlbmVyYXRvci5lbWl0UHV0QnlJZChiYXNlLmdldCgpLCBt X2lkZW50LCByZXN1bHQpOwotICAgIHJldHVybiBnZW5lcmF0b3IubW92ZVRvRGVzdGluYXRpb25J Zk5lZWRlZChkc3QsIHJlc3VsdCk7CisgICAgUmVnaXN0ZXJJRCogZm9yd2FyZFJlc3VsdCA9IChk c3QgPT0gZ2VuZXJhdG9yLmlnbm9yZWRSZXN1bHQoKSkgPyByZXN1bHQgOiBnZW5lcmF0b3IubW92 ZVRvRGVzdGluYXRpb25JZk5lZWRlZChnZW5lcmF0b3IudGVtcERlc3RpbmF0aW9uKHJlc3VsdCks IHJlc3VsdCk7CisgICAgZ2VuZXJhdG9yLmVtaXRQdXRCeUlkKGJhc2UuZ2V0KCksIG1faWRlbnQs IGZvcndhcmRSZXN1bHQpOworICAgIHJldHVybiBnZW5lcmF0b3IubW92ZVRvRGVzdGluYXRpb25J Zk5lZWRlZChkc3QsIGZvcndhcmRSZXN1bHQpOwogfQogCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0gUmVhZE1vZGlmeURvdE5vZGUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KQEAgLTEyNTEsOCArMTI1Miw5IEBACiAgICAgUmVnaXN0ZXJJRCogcmVzdWx0ID0g Z2VuZXJhdG9yLmVtaXROb2RlKHZhbHVlLmdldCgpLCBtX3JpZ2h0KTsKIAogICAgIGdlbmVyYXRv ci5lbWl0RXhwcmVzc2lvbkluZm8oZGl2b3QoKSwgc3RhcnRPZmZzZXQoKSwgZW5kT2Zmc2V0KCkp OwotICAgIGdlbmVyYXRvci5lbWl0UHV0QnlWYWwoYmFzZS5nZXQoKSwgcHJvcGVydHkuZ2V0KCks IHJlc3VsdCk7Ci0gICAgcmV0dXJuIGdlbmVyYXRvci5tb3ZlVG9EZXN0aW5hdGlvbklmTmVlZGVk KGRzdCwgcmVzdWx0KTsKKyAgICBSZWdpc3RlcklEKiBmb3J3YXJkUmVzdWx0ID0gKGRzdCA9PSBn ZW5lcmF0b3IuaWdub3JlZFJlc3VsdCgpKSA/IHJlc3VsdCA6IGdlbmVyYXRvci5tb3ZlVG9EZXN0 aW5hdGlvbklmTmVlZGVkKGdlbmVyYXRvci50ZW1wRGVzdGluYXRpb24ocmVzdWx0KSwgcmVzdWx0 KTsKKyAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5VmFsKGJhc2UuZ2V0KCksIHByb3BlcnR5LmdldCgp LCBmb3J3YXJkUmVzdWx0KTsKKyAgICByZXR1cm4gZ2VuZXJhdG9yLm1vdmVUb0Rlc3RpbmF0aW9u SWZOZWVkZWQoZHN0LCBmb3J3YXJkUmVzdWx0KTsKIH0KIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tIFJlYWRNb2RpZnlCcmFja2V0Tm9kZSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQo= 111888 2011-10-20 19:03:04 -0700 2011-10-20 19:52:12 -0700 Correct format. patch text/plain 2754 zheng.z.liu SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTgwNTMpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAK KzIwMTEtMTAtMjAgIFpoZW5nIExpdSAgPHpoZW5nLnoubGl1QGludGVsLmNvbT4KKworICAgICAg ICBieXRlY29tcGlsZXIgc29tZXRpbWVzIGdlbmVyYXRlcyBpbmNvcnJlY3QgYnl0ZWNvZGUgZm9y IHB1dF9ieV9pZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzA0MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpBc3NpZ25E b3ROb2RlOjplbWl0Qnl0ZWNvZGUpOgorICAgICAgICAoSlNDOjpBc3NpZ25CcmFja2V0Tm9kZTo6 ZW1pdEJ5dGVjb2RlKToKKworMjAxMS0xMC0yMCAgWmhlbmcgTGl1ICA8emhlbmcuei5saXVAaW50 ZWwuY29tPgorCisgICAgICAgIE5lZWQgYSBzaG9ydCBkZXNjcmlwdGlvbiBhbmQgYnVnIFVSTCAo T09QUyEpCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcDoKKyAgICAgICAgKEpTQzo6QXNzaWduRG90 Tm9kZTo6ZW1pdEJ5dGVjb2RlKToKKyAgICAgICAgKEpTQzo6QXNzaWduQnJhY2tldE5vZGU6OmVt aXRCeXRlY29kZSk6CisKIDIwMTEtMTAtMjAgIFZpbmNlbnQgU2NoZWliICA8c2NoZWliQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBNb3VzZUxvY2sgY29tcGlsZSBhbmQgcnVuIHRpbWUgZmxhZ3Mu CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05vZGVzQ29kZWdlbi5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9Ob2Rl c0NvZGVnZW4uY3BwCShyZXZpc2lvbiA5ODA1MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29tcGlsZXIvTm9kZXNDb2RlZ2VuLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIxNiw4ICsx MjE2LDkgQEAgUmVnaXN0ZXJJRCogQXNzaWduRG90Tm9kZTo6ZW1pdEJ5dGVjb2RlKAogICAgIFJl ZlB0cjxSZWdpc3RlcklEPiB2YWx1ZSA9IGdlbmVyYXRvci5kZXN0aW5hdGlvbkZvckFzc2lnblJl c3VsdChkc3QpOwogICAgIFJlZ2lzdGVySUQqIHJlc3VsdCA9IGdlbmVyYXRvci5lbWl0Tm9kZSh2 YWx1ZS5nZXQoKSwgbV9yaWdodCk7CiAgICAgZ2VuZXJhdG9yLmVtaXRFeHByZXNzaW9uSW5mbyhk aXZvdCgpLCBzdGFydE9mZnNldCgpLCBlbmRPZmZzZXQoKSk7Ci0gICAgZ2VuZXJhdG9yLmVtaXRQ dXRCeUlkKGJhc2UuZ2V0KCksIG1faWRlbnQsIHJlc3VsdCk7Ci0gICAgcmV0dXJuIGdlbmVyYXRv ci5tb3ZlVG9EZXN0aW5hdGlvbklmTmVlZGVkKGRzdCwgcmVzdWx0KTsKKyAgICBSZWdpc3RlcklE KiBmb3J3YXJkUmVzdWx0ID0gKGRzdCA9PSBnZW5lcmF0b3IuaWdub3JlZFJlc3VsdCgpKSA/IHJl c3VsdCA6IGdlbmVyYXRvci5tb3ZlVG9EZXN0aW5hdGlvbklmTmVlZGVkKGdlbmVyYXRvci50ZW1w RGVzdGluYXRpb24ocmVzdWx0KSwgcmVzdWx0KTsKKyAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5SWQo YmFzZS5nZXQoKSwgbV9pZGVudCwgZm9yd2FyZFJlc3VsdCk7CisgICAgcmV0dXJuIGdlbmVyYXRv ci5tb3ZlVG9EZXN0aW5hdGlvbklmTmVlZGVkKGRzdCwgZm9yd2FyZFJlc3VsdCk7CiB9CiAKIC8v IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSBSZWFkTW9kaWZ5RG90Tm9kZSAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtMTI1MSw4ICsxMjUyLDkgQEAgUmVnaXN0 ZXJJRCogQXNzaWduQnJhY2tldE5vZGU6OmVtaXRCeXRlYwogICAgIFJlZ2lzdGVySUQqIHJlc3Vs dCA9IGdlbmVyYXRvci5lbWl0Tm9kZSh2YWx1ZS5nZXQoKSwgbV9yaWdodCk7CiAKICAgICBnZW5l cmF0b3IuZW1pdEV4cHJlc3Npb25JbmZvKGRpdm90KCksIHN0YXJ0T2Zmc2V0KCksIGVuZE9mZnNl dCgpKTsKLSAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5VmFsKGJhc2UuZ2V0KCksIHByb3BlcnR5Lmdl dCgpLCByZXN1bHQpOwotICAgIHJldHVybiBnZW5lcmF0b3IubW92ZVRvRGVzdGluYXRpb25JZk5l ZWRlZChkc3QsIHJlc3VsdCk7CisgICAgUmVnaXN0ZXJJRCogZm9yd2FyZFJlc3VsdCA9IChkc3Qg PT0gZ2VuZXJhdG9yLmlnbm9yZWRSZXN1bHQoKSkgPyByZXN1bHQgOiBnZW5lcmF0b3IubW92ZVRv RGVzdGluYXRpb25JZk5lZWRlZChnZW5lcmF0b3IudGVtcERlc3RpbmF0aW9uKHJlc3VsdCksIHJl c3VsdCk7CisgICAgZ2VuZXJhdG9yLmVtaXRQdXRCeVZhbChiYXNlLmdldCgpLCBwcm9wZXJ0eS5n ZXQoKSwgZm9yd2FyZFJlc3VsdCk7CisgICAgcmV0dXJuIGdlbmVyYXRvci5tb3ZlVG9EZXN0aW5h dGlvbklmTmVlZGVkKGRzdCwgZm9yd2FyZFJlc3VsdCk7CiB9CiAKIC8vIC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLSBSZWFkTW9kaWZ5QnJhY2tldE5vZGUgLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0K 111891 2011-10-20 19:52:12 -0700 2011-10-21 00:58:58 -0700 Fix ChangeLog patch text/plain 2471 zheng.z.liu SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTgwNTkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTEtMTAtMjAgIFpoZW5nIExpdSAgPHpoZW5nLnoubGl1QGludGVsLmNvbT4KKworICAgICAg ICBieXRlY29tcGlsZXIgc29tZXRpbWVzIGdlbmVyYXRlcyBpbmNvcnJlY3QgYnl0ZWNvZGUgZm9y IHB1dF9ieV9pZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzA0MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpBc3NpZ25E b3ROb2RlOjplbWl0Qnl0ZWNvZGUpOgorICAgICAgICAoSlNDOjpBc3NpZ25CcmFja2V0Tm9kZTo6 ZW1pdEJ5dGVjb2RlKToKKwogMjAxMS0xMC0yMCAgVmluY2VudCBTY2hlaWIgIDxzY2hlaWJAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIE1vdXNlTG9jayBjb21waWxlIGFuZCBydW4gdGltZSBmbGFn cy4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2Vu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05v ZGVzQ29kZWdlbi5jcHAJKHJldmlzaW9uIDk4MDU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjE2LDgg KzEyMTYsOSBAQCBSZWdpc3RlcklEKiBBc3NpZ25Eb3ROb2RlOjplbWl0Qnl0ZWNvZGUoCiAgICAg UmVmUHRyPFJlZ2lzdGVySUQ+IHZhbHVlID0gZ2VuZXJhdG9yLmRlc3RpbmF0aW9uRm9yQXNzaWdu UmVzdWx0KGRzdCk7CiAgICAgUmVnaXN0ZXJJRCogcmVzdWx0ID0gZ2VuZXJhdG9yLmVtaXROb2Rl KHZhbHVlLmdldCgpLCBtX3JpZ2h0KTsKICAgICBnZW5lcmF0b3IuZW1pdEV4cHJlc3Npb25JbmZv KGRpdm90KCksIHN0YXJ0T2Zmc2V0KCksIGVuZE9mZnNldCgpKTsKLSAgICBnZW5lcmF0b3IuZW1p dFB1dEJ5SWQoYmFzZS5nZXQoKSwgbV9pZGVudCwgcmVzdWx0KTsKLSAgICByZXR1cm4gZ2VuZXJh dG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZOZWVkZWQoZHN0LCByZXN1bHQpOworICAgIFJlZ2lzdGVy SUQqIGZvcndhcmRSZXN1bHQgPSAoZHN0ID09IGdlbmVyYXRvci5pZ25vcmVkUmVzdWx0KCkpID8g cmVzdWx0IDogZ2VuZXJhdG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZOZWVkZWQoZ2VuZXJhdG9yLnRl bXBEZXN0aW5hdGlvbihyZXN1bHQpLCByZXN1bHQpOworICAgIGdlbmVyYXRvci5lbWl0UHV0QnlJ ZChiYXNlLmdldCgpLCBtX2lkZW50LCBmb3J3YXJkUmVzdWx0KTsKKyAgICByZXR1cm4gZ2VuZXJh dG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZOZWVkZWQoZHN0LCBmb3J3YXJkUmVzdWx0KTsKIH0KIAog Ly8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tIFJlYWRNb2RpZnlEb3ROb2RlIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC0xMjUxLDggKzEyNTIsOSBAQCBSZWdp c3RlcklEKiBBc3NpZ25CcmFja2V0Tm9kZTo6ZW1pdEJ5dGVjCiAgICAgUmVnaXN0ZXJJRCogcmVz dWx0ID0gZ2VuZXJhdG9yLmVtaXROb2RlKHZhbHVlLmdldCgpLCBtX3JpZ2h0KTsKIAogICAgIGdl bmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8oZGl2b3QoKSwgc3RhcnRPZmZzZXQoKSwgZW5kT2Zm c2V0KCkpOwotICAgIGdlbmVyYXRvci5lbWl0UHV0QnlWYWwoYmFzZS5nZXQoKSwgcHJvcGVydHku Z2V0KCksIHJlc3VsdCk7Ci0gICAgcmV0dXJuIGdlbmVyYXRvci5tb3ZlVG9EZXN0aW5hdGlvbklm TmVlZGVkKGRzdCwgcmVzdWx0KTsKKyAgICBSZWdpc3RlcklEKiBmb3J3YXJkUmVzdWx0ID0gKGRz dCA9PSBnZW5lcmF0b3IuaWdub3JlZFJlc3VsdCgpKSA/IHJlc3VsdCA6IGdlbmVyYXRvci5tb3Zl VG9EZXN0aW5hdGlvbklmTmVlZGVkKGdlbmVyYXRvci50ZW1wRGVzdGluYXRpb24ocmVzdWx0KSwg cmVzdWx0KTsKKyAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5VmFsKGJhc2UuZ2V0KCksIHByb3BlcnR5 LmdldCgpLCBmb3J3YXJkUmVzdWx0KTsKKyAgICByZXR1cm4gZ2VuZXJhdG9yLm1vdmVUb0Rlc3Rp bmF0aW9uSWZOZWVkZWQoZHN0LCBmb3J3YXJkUmVzdWx0KTsKIH0KIAogLy8gLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tIFJlYWRNb2RpZnlCcmFja2V0Tm9kZSAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQo= 111919 2011-10-21 00:58:58 -0700 2011-10-21 02:10:34 -0700 Added test at LayoutTests/fast/js. patch text/plain 4767 zheng.z.liu SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gOTgwNTkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTEtMTAtMjAgIFpoZW5nIExpdSAgPHpoZW5nLnoubGl1QGludGVsLmNvbT4KKworICAgICAg ICBieXRlY29tcGlsZXIgc29tZXRpbWVzIGdlbmVyYXRlcyBpbmNvcnJlY3QgYnl0ZWNvZGUgZm9y IHB1dF9ieV9pZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzA0MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGJ5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwOgorICAgICAgICAoSlNDOjpBc3NpZ25E b3ROb2RlOjplbWl0Qnl0ZWNvZGUpOgorICAgICAgICAoSlNDOjpBc3NpZ25CcmFja2V0Tm9kZTo6 ZW1pdEJ5dGVjb2RlKToKKwogMjAxMS0xMC0yMCAgVmluY2VudCBTY2hlaWIgIDxzY2hlaWJAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIE1vdXNlTG9jayBjb21waWxlIGFuZCBydW4gdGltZSBmbGFn cy4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvTm9kZXNDb2RlZ2Vu LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL05v ZGVzQ29kZWdlbi5jcHAJKHJldmlzaW9uIDk4MDU5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2J5dGVjb21waWxlci9Ob2Rlc0NvZGVnZW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjE2LDgg KzEyMTYsOSBAQCBSZWdpc3RlcklEKiBBc3NpZ25Eb3ROb2RlOjplbWl0Qnl0ZWNvZGUoCiAgICAg UmVmUHRyPFJlZ2lzdGVySUQ+IHZhbHVlID0gZ2VuZXJhdG9yLmRlc3RpbmF0aW9uRm9yQXNzaWdu UmVzdWx0KGRzdCk7CiAgICAgUmVnaXN0ZXJJRCogcmVzdWx0ID0gZ2VuZXJhdG9yLmVtaXROb2Rl KHZhbHVlLmdldCgpLCBtX3JpZ2h0KTsKICAgICBnZW5lcmF0b3IuZW1pdEV4cHJlc3Npb25JbmZv KGRpdm90KCksIHN0YXJ0T2Zmc2V0KCksIGVuZE9mZnNldCgpKTsKLSAgICBnZW5lcmF0b3IuZW1p dFB1dEJ5SWQoYmFzZS5nZXQoKSwgbV9pZGVudCwgcmVzdWx0KTsKLSAgICByZXR1cm4gZ2VuZXJh dG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZOZWVkZWQoZHN0LCByZXN1bHQpOworICAgIFJlZ2lzdGVy SUQqIGZvcndhcmRSZXN1bHQgPSAoZHN0ID09IGdlbmVyYXRvci5pZ25vcmVkUmVzdWx0KCkpID8g cmVzdWx0IDogZ2VuZXJhdG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZOZWVkZWQoZ2VuZXJhdG9yLnRl bXBEZXN0aW5hdGlvbihyZXN1bHQpLCByZXN1bHQpOworICAgIGdlbmVyYXRvci5lbWl0UHV0QnlJ ZChiYXNlLmdldCgpLCBtX2lkZW50LCBmb3J3YXJkUmVzdWx0KTsKKyAgICByZXR1cm4gZ2VuZXJh dG9yLm1vdmVUb0Rlc3RpbmF0aW9uSWZOZWVkZWQoZHN0LCBmb3J3YXJkUmVzdWx0KTsKIH0KIAog Ly8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tIFJlYWRNb2RpZnlEb3ROb2RlIC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCkBAIC0xMjUxLDggKzEyNTIsOSBAQCBSZWdp c3RlcklEKiBBc3NpZ25CcmFja2V0Tm9kZTo6ZW1pdEJ5dGVjCiAgICAgUmVnaXN0ZXJJRCogcmVz dWx0ID0gZ2VuZXJhdG9yLmVtaXROb2RlKHZhbHVlLmdldCgpLCBtX3JpZ2h0KTsKIAogICAgIGdl bmVyYXRvci5lbWl0RXhwcmVzc2lvbkluZm8oZGl2b3QoKSwgc3RhcnRPZmZzZXQoKSwgZW5kT2Zm c2V0KCkpOwotICAgIGdlbmVyYXRvci5lbWl0UHV0QnlWYWwoYmFzZS5nZXQoKSwgcHJvcGVydHku Z2V0KCksIHJlc3VsdCk7Ci0gICAgcmV0dXJuIGdlbmVyYXRvci5tb3ZlVG9EZXN0aW5hdGlvbklm TmVlZGVkKGRzdCwgcmVzdWx0KTsKKyAgICBSZWdpc3RlcklEKiBmb3J3YXJkUmVzdWx0ID0gKGRz dCA9PSBnZW5lcmF0b3IuaWdub3JlZFJlc3VsdCgpKSA/IHJlc3VsdCA6IGdlbmVyYXRvci5tb3Zl VG9EZXN0aW5hdGlvbklmTmVlZGVkKGdlbmVyYXRvci50ZW1wRGVzdGluYXRpb24ocmVzdWx0KSwg cmVzdWx0KTsKKyAgICBnZW5lcmF0b3IuZW1pdFB1dEJ5VmFsKGJhc2UuZ2V0KCksIHByb3BlcnR5 LmdldCgpLCBmb3J3YXJkUmVzdWx0KTsKKyAgICByZXR1cm4gZ2VuZXJhdG9yLm1vdmVUb0Rlc3Rp bmF0aW9uSWZOZWVkZWQoZHN0LCBmb3J3YXJkUmVzdWx0KTsKIH0KIAogLy8gLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tIFJlYWRNb2RpZnlCcmFja2V0Tm9kZSAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9qcy9jb2RlZ2VuLWFz c2lnbi1ub250ZW1wb3JhcnktYXMtcmV4cC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZmFzdC9qcy9jb2RlZ2VuLWFzc2lnbi1ub250ZW1wb3JhcnktYXMtcmV4cC1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2pzL2NvZGVnZW4tYXNz aWduLW5vbnRlbXBvcmFyeS1hcy1yZXhwLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAs MCArMSwxMSBAQAorVGVzdHMgd2hldGhlciBieXRlY29kZSBjb2RlZ2VuIHByb3Blcmx5IGhhbmRs ZXMgYXNzaWdubWVudCBhcyByaWdodGhhbmQgZXhwcmVzc2lvbi4KKworT24gc3VjY2VzcywgeW91 IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1Qg Q09NUExFVEUiLgorCisKK1BBU1MgYXNzaWduX2FzX3JleHBfMSgpIGlzICdQQVNTJworUEFTUyBh c3NpZ25fYXNfcmV4cF8yKCkgaXMgJ1BBU1MnCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0 cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9qcy9jb2RlZ2Vu LWFzc2lnbi1ub250ZW1wb3JhcnktYXMtcmV4cC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL2Zhc3QvanMvY29kZWdlbi1hc3NpZ24tbm9udGVtcG9yYXJ5LWFzLXJleHAuaHRtbAkocmV2 aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvanMvY29kZWdlbi1hc3NpZ24tbm9udGVtcG9y YXJ5LWFzLXJleHAuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMCBAQAorPCFET0NUWVBF IEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxz Y3JpcHQgc3JjPSJyZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHk+Cis8c2NyaXB0IHNyYz0ic2NyaXB0LXRlc3RzL2NvZGVnZW4tYXNzaWduLW5vbnRlbXBv cmFyeS1hcy1yZXhwLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvanMtdGVz dC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IExheW91dFRlc3Rz L2Zhc3QvanMvc2NyaXB0LXRlc3RzL2NvZGVnZW4tYXNzaWduLW5vbnRlbXBvcmFyeS1hcy1yZXhw LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvanMvc2NyaXB0LXRlc3RzL2NvZGVn ZW4tYXNzaWduLW5vbnRlbXBvcmFyeS1hcy1yZXhwLmpzCShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvZmFzdC9qcy9zY3JpcHQtdGVzdHMvY29kZWdlbi1hc3NpZ24tbm9udGVtcG9yYXJ5LWFz LXJleHAuanMJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzUgQEAKK2Rlc2NyaXB0aW9uKAorJ1Rl c3RzIHdoZXRoZXIgYnl0ZWNvZGUgY29kZWdlbiBwcm9wZXJseSBoYW5kbGVzIGFzc2lnbm1lbnQg YXMgcmlnaHRoYW5kIGV4cHJlc3Npb24uJworKTsKKworCitmdW5jdGlvbiBhc3NpZ25fYXNfcmV4 cF8xKCkgeworICB2YXIgb2JqID0ge307CisgIHZhciB2aWN0aW0gPSAnUEFTUyc7CisgIG9iai5f X2RlZmluZVNldHRlcl9fKCdzbG90JywKKyAgICAgIGZ1bmN0aW9uKHYpIHsKKyAgICAgICAgICB2 aWN0aW0gPSAnRkFJTCc7CisgICAgICB9KTsKKyAgdmFyIG9iajIgPSB7fTsKKyAgb2JqMi5mb3J3 YXJkID0gKG9ialsnc2xvdCddID0gdmljdGltKTsKKyAgcmV0dXJuIG9iajIuZm9yd2FyZDsKK307 CisKK3Nob3VsZEJlKCJhc3NpZ25fYXNfcmV4cF8xKCkiLCAiJ1BBU1MnIik7CisKKworZnVuY3Rp b24gYXNzaWduX2FzX3JleHBfMigpIHsKKyAgdmFyIG9iaiA9IHt9OworICB2YXIgdmljdGltID0g J1BBU1MnOworICBvYmouX19kZWZpbmVTZXR0ZXJfXygnc2xvdCcsCisgICAgICBmdW5jdGlvbih2 KSB7CisgICAgICAgICAgdmljdGltID0gJ0ZBSUwnOworICAgICAgfSk7CisgIHZhciBvYmoyID0g e307CisgIG9iajIuZm9yd2FyZCA9IChvYmouc2xvdCA9IHZpY3RpbSk7CisgIHJldHVybiBvYmoy LmZvcndhcmQ7Cit9OworCitzaG91bGRCZSgiYXNzaWduX2FzX3JleHBfMigpIiwgIidQQVNTJyIp OworCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsK