18641 2008-04-20 16:08:35 -0700 SQUIRRELFISH: add support for error nodes 2008-04-20 16:36:48 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 18624 1 zwarich webkit-unassigned oldest_to_newest 78337 0 zwarich 2008-04-20 16:08:35 -0700 SquirrelFish currently doesn't support AssignErrorNode, PrefixErrorNode, and PostfixErrorNode. This causes the JavaScriptCore test ecma/LexicalConventions/7.5-10-n.js to fail. 78338 1 20709 zwarich 2008-04-20 16:11:02 -0700 Created attachment 20709 Proposed patch Here is a patch that implements support for error nodes. I tested with SunSpider and it showed no change. Should I break up lines with the long string constants so they are each on their own line? 78339 2 20709 mjs 2008-04-20 16:15:19 -0700 Comment on attachment 20709 Proposed patch Assuming this shows no sunspider regression, r=me. 78343 3 zwarich 2008-04-20 16:36:48 -0700 Landed in r32283. 20709 2008-04-20 16:11:02 -0700 2008-04-20 16:15:19 -0700 Proposed patch error.diff text/plain 7677 zwarich SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMyMjgy KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDgtMDQt MjAgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1d2F0ZXJsb28uY2E+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIEFz c2lnbkVycm9yTm9kZSwgUHJlZml4RXJyb3JOb2RlLCBhbmQgUG9zdGZpeEVycm9yTm9kZS4KKwor ICAgICAgICAqIFZNL0NvZGVCbG9jay5jcHA6CisgICAgICAgIChLSlM6OkNvZGVCbG9jazo6ZHVt cCk6CisgICAgICAgICogVk0vQ29kZUdlbmVyYXRvci5jcHA6CisgICAgICAgIChLSlM6OkNvZGVH ZW5lcmF0b3I6OmVtaXRDcmVhdGVFcnJvcik6CisgICAgICAgICogVk0vQ29kZUdlbmVyYXRvci5o OgorICAgICAgICAqIFZNL01hY2hpbmUuY3BwOgorICAgICAgICAoS0pTOjpNYWNoaW5lOjpwcml2 YXRlRXhlY3V0ZSk6CisgICAgICAgICogVk0vT3Bjb2RlLmg6CisgICAgICAgICoga2pzL25vZGVz LmNwcDoKKyAgICAgICAgKEtKUzo6UG9zdGZpeEVycm9yTm9kZTo6ZW1pdENvZGUpOgorICAgICAg ICAoS0pTOjpQcmVmaXhFcnJvck5vZGU6OmVtaXRDb2RlKToKKyAgICAgICAgKEtKUzo6QXNzaWdu RXJyb3JOb2RlOjplbWl0Q29kZSk6CisgICAgICAgICoga2pzL25vZGVzLmg6CisKIDIwMDgtMDQt MjAgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBHZW9mZiBhbmQgTWFyay4KSW5kZXg6IFZNL0NvZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g Vk0vQ29kZUJsb2NrLmNwcAkocmV2aXNpb24gMzIyODEpCisrKyBWTS9Db2RlQmxvY2suY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00OTAsNiArNDkwLDEzIEBAIHZvaWQgQ29kZUJsb2NrOjpkdW1wKEV4 ZWNTdGF0ZSogZXhlYywgY28KICAgICAgICAgICAgIHByaW50ZigiWyU0ZF0gdGhyb3dcdFx0JXNc biIsIGxvY2F0aW9uLCByZWdpc3Rlck5hbWUocjApLmNfc3RyKCkpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KKyAgICAgICAgY2FzZSBvcF9jcmVhdGVfZXJyb3I6IHsKKyAgICAgICAg ICAgIGludCByMCA9ICgrK2l0KS0+dS5vcGVyYW5kOworICAgICAgICAgICAgaW50IGVycm9yVHlw ZSA9ICgrK2l0KS0+dS5vcGVyYW5kOworICAgICAgICAgICAgaW50IGswID0gKCsraXQpLT51Lm9w ZXJhbmQ7CisgICAgICAgICAgICBwcmludGYoIlslNGRdIGNyZWF0ZV9lcnJvclx0JXMsICVkLCAl c1xuIiwgbG9jYXRpb24sIHJlZ2lzdGVyTmFtZShyMCkuY19zdHIoKSwgZXJyb3JUeXBlLCBjb25z dGFudE5hbWUoZXhlYywgazAsIGpzVmFsdWVzW2swXSkuY19zdHIoKSk7CisgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgfQogICAgICAgICBjYXNlIG9wX2pzcjogewogICAgICAgICAgICAgaW50 IHJldEFkZHJEc3QgPSAoKytpdCktPnUub3BlcmFuZDsKICAgICAgICAgICAgIGludCBvZmZzZXQg PSAoKytpdCktPnUub3BlcmFuZDsKSW5kZXg6IFZNL0NvZGVHZW5lcmF0b3IuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFZNL0NvZGVHZW5lcmF0b3IuY3BwCShyZXZpc2lvbiAzMjI4MSkKKysrIFZNL0NvZGVH ZW5lcmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDI1LDYgKzEwMjUsMTUgQEAgdm9pZCBD b2RlR2VuZXJhdG9yOjplbWl0VGhyb3coUmVnaXN0ZXJJRAogICAgIGluc3RydWN0aW9ucygpLmFw cGVuZChleGNlcHRpb24tPmluZGV4KCkpOwogfQogCitSZWdpc3RlcklEKiBDb2RlR2VuZXJhdG9y OjplbWl0Q3JlYXRlRXJyb3IoUmVnaXN0ZXJJRCogcjAsIEVycm9yVHlwZSBlcnJvclR5cGUsIEpT VmFsdWUqIGVycm9yTWVzc2FnZSkKK3sKKyAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQobWFjaGlu ZSgpLmdldE9wY29kZShvcF9jcmVhdGVfZXJyb3IpKTsKKyAgICBpbnN0cnVjdGlvbnMoKS5hcHBl bmQocjAtPmluZGV4KCkpOworICAgIGluc3RydWN0aW9ucygpLmFwcGVuZCgoaW50KSBlcnJvclR5 cGUpOworICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChhZGRDb25zdGFudChlcnJvck1lc3NhZ2Up KTsKKyAgICByZXR1cm4gcjA7Cit9CisKIFBhc3NSZWZQdHI8TGFiZWxJRD4gQ29kZUdlbmVyYXRv cjo6ZW1pdEp1bXBTdWJyb3V0aW5lKFJlZ2lzdGVySUQqIHJldEFkZHJEc3QsIExhYmVsSUQqIGZp bmFsbHkpCiB7CiAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKG1hY2hpbmUoKS5nZXRPcGNvZGUo b3BfanNyKSk7CkluZGV4OiBWTS9Db2RlR2VuZXJhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVk0vQ29k ZUdlbmVyYXRvci5oCShyZXZpc2lvbiAzMjI4MSkKKysrIFZNL0NvZGVHZW5lcmF0b3IuaAkod29y a2luZyBjb3B5KQpAQCAtMjMyLDYgKzIzMiw3IEBAIG5hbWVzcGFjZSBLSlMgewogCiAgICAgICAg IFJlZ2lzdGVySUQqIGVtaXRDYXRjaChSZWdpc3RlcklEKiwgTGFiZWxJRCogc3RhcnQsIExhYmVs SUQqIGVuZCk7CiAgICAgICAgIHZvaWQgZW1pdFRocm93KFJlZ2lzdGVySUQqKTsKKyAgICAgICAg UmVnaXN0ZXJJRCogZW1pdENyZWF0ZUVycm9yKFJlZ2lzdGVySUQqLCBFcnJvclR5cGUsIEpTVmFs dWUqKTsKIAogICAgIHByaXZhdGU6CiAgICAgICAgIFBhc3NSZWZQdHI8TGFiZWxJRD4gZW1pdENv bXBsZXhKdW1wU2NvcGVzKExhYmVsSUQqIHRhcmdldCwgQ29udHJvbEZsb3dDb250ZXh0KiB0b3BT Y29wZSwgQ29udHJvbEZsb3dDb250ZXh0KiBib3R0b21TY29wZSk7CkluZGV4OiBWTS9NYWNoaW5l LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBWTS9NYWNoaW5lLmNwcAkocmV2aXNpb24gMzIyODEpCisrKyBW TS9NYWNoaW5lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTUwOSw2ICsxNTA5LDE2IEBAIEpTVmFs dWUqIE1hY2hpbmU6OnByaXZhdGVFeGVjdXRlKEV4ZWN1dGkKICAgICAgICAgdlBDID0gaGFuZGxl clZQQzsKICAgICAgICAgTkVYVF9PUENPREU7CiAgICAgfQorICAgIEJFR0lOX09QQ09ERShvcF9j cmVhdGVfZXJyb3IpIHsKKyAgICAgICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOworICAg ICAgICBpbnQgZXJyb3JUeXBlID0gKCsrdlBDKS0+dS5vcGVyYW5kOworICAgICAgICBpbnQgazAg PSAoKyt2UEMpLT51Lm9wZXJhbmQ7CisgICAgICAgIAorICAgICAgICByW3IwXS51LmpzVmFsdWUg PSBFcnJvcjo6Y3JlYXRlKGV4ZWMsIChFcnJvclR5cGUpIGVycm9yVHlwZSwga1trMF0tPnRvU3Ry aW5nKGV4ZWMpLCAtMSwgLTEsIDApOyAvLyBsaW5lTm8oKSwgY3VycmVudFNvdXJjZUlkKGV4ZWMp LCBjdXJyZW50U291cmNlVVJMKGV4ZWMpCisgICAgICAgIAorICAgICAgICArK3ZQQzsKKyAgICAg ICAgTkVYVF9PUENPREU7CisgICAgfQogICAgIEJFR0lOX09QQ09ERShvcF9lbmQpIHsKICAgICAg ICAgaW50IHIwID0gKCsrdlBDKS0+dS5vcGVyYW5kOwogICAgICAgICByZXR1cm4gcltyMF0udS5q c1ZhbHVlOwpJbmRleDogVk0vT3Bjb2RlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVk0vT3Bjb2RlLmgJKHJl dmlzaW9uIDMyMjgxKQorKysgVk0vT3Bjb2RlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwOSw2ICsx MDksNyBAQCBuYW1lc3BhY2UgS0pTIHsKICAgICAgICAgbWFjcm8ob3BfY2F0Y2gpIFwKICAgICAg ICAgbWFjcm8ob3BfdGhyb3cpIFwKICAgICAgICAgbWFjcm8ob3BfYnVpbHRpbl90aHJvdykgXAor ICAgICAgICBtYWNybyhvcF9jcmVhdGVfZXJyb3IpIFwKICAgICAgICAgXAogICAgICAgICBtYWNy byhvcF9qc3IpIFwKICAgICAgICAgbWFjcm8ob3Bfc3JldCkgXApJbmRleDoga2pzL25vZGVzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBranMvbm9kZXMuY3BwCShyZXZpc2lvbiAzMjI4MSkKKysrIGtqcy9u b2Rlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMzIsNiArMjAzMiwxNCBAQCBKU1ZhbHVlKiBQ b3N0RGVjRG90Tm9kZTo6ZXZhbHVhdGUoRXhlY1N0CiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLSBQb3N0Zml4RXJyb3JOb2RlIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiAKK1JlZ2lzdGVySUQqIFBvc3RmaXhFcnJvck5vZGU6OmVtaXRDb2RlKENvZGVHZW5l cmF0b3ImIGdlbmVyYXRvciwgUmVnaXN0ZXJJRCogZHN0KQoreworICAgIFVTdHJpbmcgZXJyb3JN ZXNzYWdlU3RyaW5nKG1fb3BlcmF0b3IgPT0gT3BQbHVzUGx1cyA/ICJQb3N0Zml4ICsrIG9wZXJh dG9yIGFwcGxpZWQgdG8gdmFsdWUgdGhhdCBpcyBub3QgYSByZWZlcmVuY2UuIiA6ICJQb3N0Zml4 IC0tIG9wZXJhdG9yIGFwcGxpZWQgdG8gdmFsdWUgdGhhdCBpcyBub3QgYSByZWZlcmVuY2UuIik7 CisgICAgUmVnaXN0ZXJJRCogcjAgPSBnZW5lcmF0b3IuZW1pdENyZWF0ZUVycm9yKGdlbmVyYXRv ci5uZXdUZW1wb3JhcnkoKSwgUmVmZXJlbmNlRXJyb3IsIGpzT3duZWRTdHJpbmcoZXJyb3JNZXNz YWdlU3RyaW5nKSk7CisgICAgZ2VuZXJhdG9yLmVtaXRUaHJvdyhyMCk7CisgICAgcmV0dXJuIGRz dDsKK30KKwogSlNWYWx1ZSogUG9zdGZpeEVycm9yTm9kZTo6ZXZhbHVhdGUoRXhlY1N0YXRlKiBl eGVjKQogewogICAgIHRocm93RXJyb3IoZXhlYywgUmVmZXJlbmNlRXJyb3IsICJQb3N0Zml4ICVz IG9wZXJhdG9yIGFwcGxpZWQgdG8gdmFsdWUgdGhhdCBpcyBub3QgYSByZWZlcmVuY2UuIiwKQEAg LTI2MDUsNiArMjYxMywxNSBAQCBKU1ZhbHVlKiBQcmVEZWNEb3ROb2RlOjpldmFsdWF0ZShFeGVj U3RhCiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSBQcmVmaXhFcnJvck5vZGUg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIAorUmVnaXN0ZXJJRCogUHJlZml4 RXJyb3JOb2RlOjplbWl0Q29kZShDb2RlR2VuZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQq IGRzdCkKK3sKKyAgICAKKyAgICBVU3RyaW5nIGVycm9yTWVzc2FnZVN0cmluZyhtX29wZXJhdG9y ID09IE9wUGx1c1BsdXMgPyAiUHJlZml4ICsrIG9wZXJhdG9yIGFwcGxpZWQgdG8gdmFsdWUgdGhh dCBpcyBub3QgYSByZWZlcmVuY2UuIiA6ICJQcmVmaXggLS0gb3BlcmF0b3IgYXBwbGllZCB0byB2 YWx1ZSB0aGF0IGlzIG5vdCBhIHJlZmVyZW5jZS4iKTsKKyAgICBSZWdpc3RlcklEKiByMCA9IGdl bmVyYXRvci5lbWl0Q3JlYXRlRXJyb3IoZ2VuZXJhdG9yLm5ld1RlbXBvcmFyeSgpLCBSZWZlcmVu Y2VFcnJvciwganNPd25lZFN0cmluZyhlcnJvck1lc3NhZ2VTdHJpbmcpKTsKKyAgICBnZW5lcmF0 b3IuZW1pdFRocm93KHIwKTsKKyAgICByZXR1cm4gZHN0OworfQorCiBKU1ZhbHVlKiBQcmVmaXhF cnJvck5vZGU6OmV2YWx1YXRlKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICB0aHJvd0Vycm9yKGV4 ZWMsIFJlZmVyZW5jZUVycm9yLCAiUHJlZml4ICVzIG9wZXJhdG9yIGFwcGxpZWQgdG8gdmFsdWUg dGhhdCBpcyBub3QgYSByZWZlcmVuY2UuIiwKQEAgLTQzMzksNiArNDM1NiwxNCBAQCBKU1ZhbHVl KiBSZWFkTW9kaWZ5RG90Tm9kZTo6ZXZhbHVhdGUoRXhlCiAKIC8vIC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLSBBc3NpZ25FcnJvck5vZGUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0KIAorUmVnaXN0ZXJJRCogQXNzaWduRXJyb3JOb2RlOjplbWl0Q29kZShDb2RlR2Vu ZXJhdG9yJiBnZW5lcmF0b3IsIFJlZ2lzdGVySUQqIGRzdCkKK3sKKyAgICBVU3RyaW5nIGVycm9y TWVzc2FnZVN0cmluZygiTGVmdCBzaWRlIG9mIGFzc2lnbm1lbnQgaXMgbm90IGEgcmVmZXJlbmNl LiIpOworICAgIFJlZ2lzdGVySUQqIHIwID0gZ2VuZXJhdG9yLmVtaXRDcmVhdGVFcnJvcihnZW5l cmF0b3IubmV3VGVtcG9yYXJ5KCksIFJlZmVyZW5jZUVycm9yLCBqc093bmVkU3RyaW5nKGVycm9y TWVzc2FnZVN0cmluZykpOworICAgIGdlbmVyYXRvci5lbWl0VGhyb3cocjApOworICAgIHJldHVy biBkc3Q7Cit9CisKIEpTVmFsdWUqIEFzc2lnbkVycm9yTm9kZTo6ZXZhbHVhdGUoRXhlY1N0YXRl KiBleGVjKQogewogICAgIHRocm93RXJyb3IoZXhlYywgUmVmZXJlbmNlRXJyb3IsICJMZWZ0IHNp ZGUgb2YgYXNzaWdubWVudCBpcyBub3QgYSByZWZlcmVuY2UuIik7CkluZGV4OiBranMvbm9kZXMu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBranMvbm9kZXMuaAkocmV2aXNpb24gMzIyODEpCisrKyBranMvbm9k ZXMuaAkod29ya2luZyBjb3B5KQpAQCAtMTE3Nyw2ICsxMTc3LDcgQEAgbmFtZXNwYWNlIEtKUyB7 CiAgICAgICAgIHsKICAgICAgICAgfQogCisgICAgICAgIHZpcnR1YWwgUmVnaXN0ZXJJRCogZW1p dENvZGUoQ29kZUdlbmVyYXRvciYsIFJlZ2lzdGVySUQqID0gMCkgS0pTX0ZBU1RfQ0FMTDsKICAg ICAgICAgdmlydHVhbCBKU1ZhbHVlKiBldmFsdWF0ZShFeGVjU3RhdGUqKSBLSlNfRkFTVF9DQUxM OwogICAgICAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtVG8oU291cmNlU3RyZWFtJikgY29uc3QgS0pT X0ZBU1RfQ0FMTDsKICAgICAgICAgdmlydHVhbCBQcmVjZWRlbmNlIHByZWNlZGVuY2UoKSBjb25z dCB7IHJldHVybiBQcmVjUG9zdGZpeDsgfQpAQCAtMTUzNyw2ICsxNTM4LDcgQEAgbmFtZXNwYWNl IEtKUyB7CiAgICAgICAgIHsKICAgICAgICAgfQogCisgICAgICAgIHZpcnR1YWwgUmVnaXN0ZXJJ RCogZW1pdENvZGUoQ29kZUdlbmVyYXRvciYsIFJlZ2lzdGVySUQqID0gMCkgS0pTX0ZBU1RfQ0FM TDsKICAgICAgICAgdmlydHVhbCBKU1ZhbHVlKiBldmFsdWF0ZShFeGVjU3RhdGUqKSBLSlNfRkFT VF9DQUxMOwogICAgICAgICB2aXJ0dWFsIHZvaWQgc3RyZWFtVG8oU291cmNlU3RyZWFtJikgY29u c3QgS0pTX0ZBU1RfQ0FMTDsKICAgICAgICAgdmlydHVhbCBQcmVjZWRlbmNlIHByZWNlZGVuY2Uo KSBjb25zdCB7IHJldHVybiBQcmVjVW5hcnk7IH0KQEAgLTI0OTUsNiArMjQ5Nyw3IEBAIG5hbWVz cGFjZSBLSlMgewogICAgICAgICB7CiAgICAgICAgIH0KIAorICAgICAgICB2aXJ0dWFsIFJlZ2lz dGVySUQqIGVtaXRDb2RlKENvZGVHZW5lcmF0b3ImLCBSZWdpc3RlcklEKiA9IDApIEtKU19GQVNU X0NBTEw7CiAgICAgICAgIHZpcnR1YWwgSlNWYWx1ZSogZXZhbHVhdGUoRXhlY1N0YXRlKikgS0pT X0ZBU1RfQ0FMTDsKICAgICAgICAgdmlydHVhbCB2b2lkIHN0cmVhbVRvKFNvdXJjZVN0cmVhbSYp IGNvbnN0IEtKU19GQVNUX0NBTEw7CiAgICAgICAgIHZpcnR1YWwgUHJlY2VkZW5jZSBwcmVjZWRl bmNlKCkgY29uc3QgeyByZXR1cm4gUHJlY0Fzc2lnbm1lbnQ7IH0K