18671 2008-04-21 15:46:13 -0700 SquirrelFish: continue inside switch fails 2008-04-21 17:51:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED EasyFix P2 Normal --- 1 oliver zwarich ggaren mjs oliver zwarich oldest_to_newest 78479 0 oliver 2008-04-21 15:46:13 -0700 Valid continue statements fail inside a switch statement while(1) { print("foo"); switch(1) { case 1: continue; } } The problem is that getJumpContext with an empty label will return the nearest JumpContext, but in the case of continue it needs to return the nearest JumpContext with a continue target. 78481 1 20741 zwarich 2008-04-21 16:20:40 -0700 Created attachment 20741 Proposed patch Here is a fix. 78482 2 20741 oliver 2008-04-21 16:23:48 -0700 Comment on attachment 20741 Proposed patch I'd prefer: + if (forContinue) { + for (int i = m_jumpContextStack.size() - 1; i >= 0; i--) { + JumpContext* scope = &m_jumpContextStack[i]; + if (scope->continueTarget) + return scope; + } + return 0; + } But other than that, r=me 78484 3 20742 zwarich 2008-04-21 16:32:04 -0700 Created attachment 20742 Revised proposed patch Modified as per Oliver's suggestion. 20741 2008-04-21 16:20:40 -0700 2008-04-21 16:32:04 -0700 Proposed patch continue.diff text/plain 2912 zwarich SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMyMzU0 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDgtMDQt MjEgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1d2F0ZXJsb28uY2E+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDE4NjcxOiBTcXVpcnJl bEZpc2g6IGNvbnRpbnVlIGluc2lkZSBzd2l0Y2ggZmFpbHMKKyAgICAgICAgPGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY3MT4KKworICAgICAgICAqIFZNL0NvZGVH ZW5lcmF0b3IuY3BwOgorICAgICAgICAoS0pTOjpDb2RlR2VuZXJhdG9yOjpqdW1wQ29udGV4dEZv ckxhYmVsKToKKyAgICAgICAgKiBWTS9Db2RlR2VuZXJhdG9yLmg6CisgICAgICAgICoga2pzL25v ZGVzLmNwcDoKKyAgICAgICAgKEtKUzo6Q29udGludWVOb2RlOjplbWl0Q29kZSk6CisKIDIwMDgt MDQtMjEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogVk0vQ29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVk0vQ29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDMyMzUzKQorKysgVk0vQ29kZUdl bmVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkyNywxMyArOTI3LDIyIEBAIHZvaWQgQ29k ZUdlbmVyYXRvcjo6cG9wSnVtcENvbnRleHQoKQogICAgIG1fanVtcENvbnRleHRTdGFjay5yZW1v dmVMYXN0KCk7CiB9CiAKLUp1bXBDb250ZXh0KiBDb2RlR2VuZXJhdG9yOjpqdW1wQ29udGV4dEZv ckxhYmVsKGNvbnN0IElkZW50aWZpZXImIGxhYmVsKQorSnVtcENvbnRleHQqIENvZGVHZW5lcmF0 b3I6Omp1bXBDb250ZXh0Rm9yTGFiZWwoY29uc3QgSWRlbnRpZmllciYgbGFiZWwsIGJvb2wgZm9y Q29udGludWUpCiB7CiAgICAgaWYoIW1fanVtcENvbnRleHRTdGFjay5zaXplKCkpCiAgICAgICAg IHJldHVybiAwOwogCi0gICAgaWYgKGxhYmVsLmlzRW1wdHkoKSkKKyAgICBpZiAobGFiZWwuaXNF bXB0eSgpKSB7CisgICAgICAgIGlmIChmb3JDb250aW51ZSkKKyAgICAgICAgICAgIGZvciAoaW50 IGkgPSBtX2p1bXBDb250ZXh0U3RhY2suc2l6ZSgpIC0gMTsgaSA+PSAwOyBpLS0pIHsKKyAgICAg ICAgICAgICAgICBKdW1wQ29udGV4dCogc2NvcGUgPSAmbV9qdW1wQ29udGV4dFN0YWNrW2ldOwor ICAgICAgICAgICAgICAgIGlmIChzY29wZS0+Y29udGludWVUYXJnZXQpCisgICAgICAgICAgICAg ICAgICAgIHJldHVybiBzY29wZTsgICAgICAgICAgICAgICAgCisgICAgICAgICAgICB9CisgICAg ICAgIAogICAgICAgICByZXR1cm4gJm1fanVtcENvbnRleHRTdGFjay5sYXN0KCk7CisgICAgfQor ICAgIAogICAgIGZvciAoaW50IGkgPSBtX2p1bXBDb250ZXh0U3RhY2suc2l6ZSgpIC0gMTsgaSA+ PSAwOyBpLS0pIHsKICAgICAgICAgSnVtcENvbnRleHQqIHNjb3BlID0gJm1fanVtcENvbnRleHRT dGFja1tpXTsKICAgICAgICAgaWYgKHNjb3BlLT5sYWJlbHMtPmNvbnRhaW5zKGxhYmVsKSkKSW5k ZXg6IFZNL0NvZGVHZW5lcmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBWTS9Db2RlR2VuZXJhdG9yLmgJ KHJldmlzaW9uIDMyMzUzKQorKysgVk0vQ29kZUdlbmVyYXRvci5oCSh3b3JraW5nIGNvcHkpCkBA IC0yMjYsNyArMjI2LDcgQEAgbmFtZXNwYWNlIEtKUyB7CiAgICAgICAgIGJvb2wgaW5KdW1wQ29u dGV4dCgpIHsgcmV0dXJuIG1fanVtcENvbnRleHRTdGFjay5zaXplKCkgPiAwOyB9OwogICAgICAg ICB2b2lkIHB1c2hKdW1wQ29udGV4dChMYWJlbFN0YWNrKiwgTGFiZWxJRCogY29udGludWVUYXJn ZXQsIExhYmVsSUQqIGJyZWFrVGFyZ2V0KTsKICAgICAgICAgdm9pZCBwb3BKdW1wQ29udGV4dCgp OwotICAgICAgICBKdW1wQ29udGV4dCoganVtcENvbnRleHRGb3JMYWJlbChjb25zdCBJZGVudGlm aWVyJik7CisgICAgICAgIEp1bXBDb250ZXh0KiBqdW1wQ29udGV4dEZvckxhYmVsKGNvbnN0IElk ZW50aWZpZXImLCBib29sIGZvckNvbnRpbnVlID0gZmFsc2UpOwogCiAgICAgICAgIFJlZ2lzdGVy SUQqIGVtaXRQdXNoU2NvcGUoUmVnaXN0ZXJJRCopOwogICAgICAgICB2b2lkIGVtaXRQb3BTY29w ZSgpOwpJbmRleDoga2pzL25vZGVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBranMvbm9kZXMuY3BwCShy ZXZpc2lvbiAzMjM1MykKKysrIGtqcy9ub2Rlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTUxOTMs NyArNTE5Myw3IEBAIFJlZ2lzdGVySUQqIENvbnRpbnVlTm9kZTo6ZW1pdENvZGUoQ29kZUcKICAg ICBpZiAoIWdlbmVyYXRvci5pbkNvbnRpbnVlQ29udGV4dCgpKQogICAgICAgICByZXR1cm4gZW1p dFRocm93RXJyb3IoZ2VuZXJhdG9yLCBkc3QsIFN5bnRheEVycm9yLCAiSW52YWxpZCBjb250aW51 ZSBzdGF0ZW1lbnQuIik7CiAKLSAgICBKdW1wQ29udGV4dCogdGFyZ2V0Q29udGV4dCA9IGdlbmVy YXRvci5qdW1wQ29udGV4dEZvckxhYmVsKG1faWRlbnQpOworICAgIEp1bXBDb250ZXh0KiB0YXJn ZXRDb250ZXh0ID0gZ2VuZXJhdG9yLmp1bXBDb250ZXh0Rm9yTGFiZWwobV9pZGVudCwgdHJ1ZSk7 CiAKICAgICBpZiAoIXRhcmdldENvbnRleHQpIHsKICAgICAgICAgaWYgKG1faWRlbnQuaXNFbXB0 eSgpKQo= 20742 2008-04-21 16:32:04 -0700 2008-04-21 16:33:37 -0700 Revised proposed patch continue.diff text/plain 2932 zwarich SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMyMzU0 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDgtMDQt MjEgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1d2F0ZXJsb28uY2E+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVnIDE4NjcxOiBTcXVpcnJl bEZpc2g6IGNvbnRpbnVlIGluc2lkZSBzd2l0Y2ggZmFpbHMKKyAgICAgICAgPGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODY3MT4KKworICAgICAgICAqIFZNL0NvZGVH ZW5lcmF0b3IuY3BwOgorICAgICAgICAoS0pTOjpDb2RlR2VuZXJhdG9yOjpqdW1wQ29udGV4dEZv ckxhYmVsKToKKyAgICAgICAgKiBWTS9Db2RlR2VuZXJhdG9yLmg6CisgICAgICAgICoga2pzL25v ZGVzLmNwcDoKKyAgICAgICAgKEtKUzo6Q29udGludWVOb2RlOjplbWl0Q29kZSk6CisKIDIwMDgt MDQtMjEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogVk0vQ29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVk0vQ29kZUdlbmVyYXRvci5jcHAJKHJldmlzaW9uIDMyMzUzKQorKysgVk0vQ29kZUdl bmVyYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTkyNywxMyArOTI3LDI0IEBAIHZvaWQgQ29k ZUdlbmVyYXRvcjo6cG9wSnVtcENvbnRleHQoKQogICAgIG1fanVtcENvbnRleHRTdGFjay5yZW1v dmVMYXN0KCk7CiB9CiAKLUp1bXBDb250ZXh0KiBDb2RlR2VuZXJhdG9yOjpqdW1wQ29udGV4dEZv ckxhYmVsKGNvbnN0IElkZW50aWZpZXImIGxhYmVsKQorSnVtcENvbnRleHQqIENvZGVHZW5lcmF0 b3I6Omp1bXBDb250ZXh0Rm9yTGFiZWwoY29uc3QgSWRlbnRpZmllciYgbGFiZWwsIGJvb2wgZm9y Q29udGludWUpCiB7CiAgICAgaWYoIW1fanVtcENvbnRleHRTdGFjay5zaXplKCkpCiAgICAgICAg IHJldHVybiAwOwogCi0gICAgaWYgKGxhYmVsLmlzRW1wdHkoKSkKKyAgICBpZiAobGFiZWwuaXNF bXB0eSgpKSB7CisgICAgICAgIGlmIChmb3JDb250aW51ZSkgeworICAgICAgICAgICAgZm9yIChp bnQgaSA9IG1fanVtcENvbnRleHRTdGFjay5zaXplKCkgLSAxOyBpID49IDA7IGktLSkgeworICAg ICAgICAgICAgICAgIEp1bXBDb250ZXh0KiBzY29wZSA9ICZtX2p1bXBDb250ZXh0U3RhY2tbaV07 CisgICAgICAgICAgICAgICAgaWYgKHNjb3BlLT5jb250aW51ZVRhcmdldCkKKyAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIHNjb3BlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgcmV0dXJu IDA7CisgICAgICAgIH0KKyAgICAgICAgCiAgICAgICAgIHJldHVybiAmbV9qdW1wQ29udGV4dFN0 YWNrLmxhc3QoKTsKKyAgICB9CisgICAgCiAgICAgZm9yIChpbnQgaSA9IG1fanVtcENvbnRleHRT dGFjay5zaXplKCkgLSAxOyBpID49IDA7IGktLSkgewogICAgICAgICBKdW1wQ29udGV4dCogc2Nv cGUgPSAmbV9qdW1wQ29udGV4dFN0YWNrW2ldOwogICAgICAgICBpZiAoc2NvcGUtPmxhYmVscy0+ Y29udGFpbnMobGFiZWwpKQpJbmRleDogVk0vQ29kZUdlbmVyYXRvci5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFZNL0NvZGVHZW5lcmF0b3IuaAkocmV2aXNpb24gMzIzNTMpCisrKyBWTS9Db2RlR2VuZXJhdG9y LmgJKHdvcmtpbmcgY29weSkKQEAgLTIyNiw3ICsyMjYsNyBAQCBuYW1lc3BhY2UgS0pTIHsKICAg ICAgICAgYm9vbCBpbkp1bXBDb250ZXh0KCkgeyByZXR1cm4gbV9qdW1wQ29udGV4dFN0YWNrLnNp emUoKSA+IDA7IH07CiAgICAgICAgIHZvaWQgcHVzaEp1bXBDb250ZXh0KExhYmVsU3RhY2sqLCBM YWJlbElEKiBjb250aW51ZVRhcmdldCwgTGFiZWxJRCogYnJlYWtUYXJnZXQpOwogICAgICAgICB2 b2lkIHBvcEp1bXBDb250ZXh0KCk7Ci0gICAgICAgIEp1bXBDb250ZXh0KiBqdW1wQ29udGV4dEZv ckxhYmVsKGNvbnN0IElkZW50aWZpZXImKTsKKyAgICAgICAgSnVtcENvbnRleHQqIGp1bXBDb250 ZXh0Rm9yTGFiZWwoY29uc3QgSWRlbnRpZmllciYsIGJvb2wgZm9yQ29udGludWUgPSBmYWxzZSk7 CiAKICAgICAgICAgUmVnaXN0ZXJJRCogZW1pdFB1c2hTY29wZShSZWdpc3RlcklEKik7CiAgICAg ICAgIHZvaWQgZW1pdFBvcFNjb3BlKCk7CkluZGV4OiBranMvbm9kZXMuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIGtqcy9ub2Rlcy5jcHAJKHJldmlzaW9uIDMyMzUzKQorKysga2pzL25vZGVzLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNTE5Myw3ICs1MTkzLDcgQEAgUmVnaXN0ZXJJRCogQ29udGludWVOb2Rl OjplbWl0Q29kZShDb2RlRwogICAgIGlmICghZ2VuZXJhdG9yLmluQ29udGludWVDb250ZXh0KCkp CiAgICAgICAgIHJldHVybiBlbWl0VGhyb3dFcnJvcihnZW5lcmF0b3IsIGRzdCwgU3ludGF4RXJy b3IsICJJbnZhbGlkIGNvbnRpbnVlIHN0YXRlbWVudC4iKTsKIAotICAgIEp1bXBDb250ZXh0KiB0 YXJnZXRDb250ZXh0ID0gZ2VuZXJhdG9yLmp1bXBDb250ZXh0Rm9yTGFiZWwobV9pZGVudCk7Cisg ICAgSnVtcENvbnRleHQqIHRhcmdldENvbnRleHQgPSBnZW5lcmF0b3IuanVtcENvbnRleHRGb3JM YWJlbChtX2lkZW50LCB0cnVlKTsKIAogICAgIGlmICghdGFyZ2V0Q29udGV4dCkgewogICAgICAg ICBpZiAobV9pZGVudC5pc0VtcHR5KCkpCg==