162793 2016-09-30 10:44:34 -0700 Use topVMEntryFrame to determine whether to skip the re-throw of a simulated throw. 2016-09-30 11:18:43 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162351 1 mark.lam mark.lam commit-queue keith_miller msaboff saam oldest_to_newest 1235282 0 mark.lam 2016-09-30 10:44:34 -0700 Change the ThrowScope destructor to use topVMEntryFrame (instead of topCallFrame) in the determination of whether to skip the re-throw of a simulated throw. This is needed because the topCallFrame is not updated in operationConstructArityCheck(), whereas topVMEntryFrame is always updated properly. Hence, we should just switch to using the more reliable topVMEntryFrame instead. 1235283 1 290348 mark.lam 2016-09-30 10:48:57 -0700 Created attachment 290348 proposed patch. 1235284 2 290348 mark.lam 2016-09-30 10:49:24 -0700 Comment on attachment 290348 proposed patch. Need to fix the comment. 1235285 3 290349 mark.lam 2016-09-30 10:51:25 -0700 Created attachment 290349 proposed patch. 1235286 4 290349 saam 2016-09-30 11:02:15 -0700 Comment on attachment 290349 proposed patch. r=me 1235297 5 mark.lam 2016-09-30 11:18:43 -0700 Thanks for the review. Landed in r206643: <http://trac.webkit.org/r206643>. 290348 2016-09-30 10:48:57 -0700 2016-09-30 10:51:25 -0700 proposed patch. bug-162793.patch text/plain 2282 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA2NjQyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE2LTA5LTMwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBV c2UgdG9wVk1FbnRyeUZyYW1lIHRvIGRldGVybWluZSB3aGV0aGVyIHRvIHNraXAgdGhlIHJlLXRo cm93IG9mIGEgc2ltdWxhdGVkIHRocm93LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTYyNzkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSBUaHJvd1Njb3BlIGRlc3RydWN0b3IgdG8gdXNl IHRvcFZNRW50cnlGcmFtZSAoaW5zdGVhZCBvZiB0b3BDYWxsRnJhbWUpCisgICAgICAgIGluIHRo ZSBkZXRlcm1pbmF0aW9uIG9mIHdoZXRoZXIgdG8gc2tpcCB0aGUgcmUtdGhyb3cgb2YgYSBzaW11 bGF0ZWQgdGhyb3cuICBUaGlzCisgICAgICAgIGlzIG5lZWRlZCBiZWNhdXNlIHRoZSB0b3BDYWxs RnJhbWUgaXMgbm90IHVwZGF0ZWQgaW4gb3BlcmF0aW9uQ29uc3RydWN0QXJpdHlDaGVjaygpCisg ICAgICAgIChhbmQgZG9lcyBub3QgbmVlZCB0byBiZSksIHdoZXJlYXMgdG9wVk1FbnRyeUZyYW1l IGlzIGFsd2F5cyB1cGRhdGVkIHByb3Blcmx5LgorICAgICAgICBIZW5jZSwgd2Ugc2hvdWxkIGp1 c3Qgc3dpdGNoIHRvIHVzaW5nIHRoZSBtb3JlIHJlbGlhYmxlIHRvcFZNRW50cnlGcmFtZSBpbnN0 ZWFkLgorCisgICAgICAgIFRoaXMgaXNzdWUgd2FzIGRpc2NvdmVyZWQgYnkgZXhpc3RpbmcgSlND IHRlc3RzIHdoZW4gZXhjZXB0aW9uIGNoZWNrIHZhbGlkYXRpb24KKyAgICAgICAgaXMgZW5hYmxl ZC4KKworICAgICAgICAqIHJ1bnRpbWUvVGhyb3dTY29wZS5jcHA6CisgICAgICAgIChKU0M6OlRo cm93U2NvcGU6On5UaHJvd1Njb3BlKToKKwogMjAxNi0wOS0zMCAgRmlsaXAgUGl6bG8gIDxmcGl6 bG9AYXBwbGUuY29tPgogCiAgICAgICAgIDY0LWJpdCBMTEludCBuZWVkcyB0byBoYXZlIGEgY29u Y3VycmVuY3ktYXdhcmUgYmFycmllcgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvVGhyb3dTY29wZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvVGhyb3dTY29wZS5jcHAJKHJldmlzaW9uIDIwNjYzNykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1Rocm93U2NvcGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NywxMyAr NTcsMTMgQEAgVGhyb3dTY29wZTo6flRocm93U2NvcGUoKQogCiAgICAgYm9vbCB3aWxsQmVIYW5k bGVCeUxMSW50T3JKSVQgPSBmYWxzZTsKICAgICB2b2lkKiBwcmV2aW91c1Njb3BlID0gbV9wcmV2 aW91c1Njb3BlOwotICAgIHZvaWQqIHRvcENhbGxGcmFtZSA9IG1fdm0udG9wQ2FsbEZyYW1lOwot ICAgIAorICAgIHZvaWQqIHRvcFZNRW50cnlGcmFtZSA9IG1fdm0udG9wVk1FbnRyeUZyYW1lOwor CiAgICAgLy8gSWYgdGhlIHRvcENhbGxGcmFtZSB3YXMgcHVzaGVkIG9uIHRoZSBzdGFjayBhZnRl ciB0aGUgcHJldmlvdXNTY29wZSB3YXMgaW5zdGFudGlhdGVkLAogICAgIC8vIHRoZW4gdGhpcyB0 aHJvd1Njb3BlIHdpbGwgYmUgcmV0dXJuaW5nIHRvIExMSU5UIG9yIEpJVCBjb2RlIHRoYXQgYWx3 YXlzIGRvIGFuIGV4Y2VwdGlvbgogICAgIC8vIGNoZWNrLiBJbiB0aGF0IGNhc2UsIHNraXAgdGhl IHNpbXVsYXRlZCB0aHJvdyBiZWNhdXNlIHRoZSBMTEludCBhbmQgSklUIHdpbGwgYmUKICAgICAv LyBjaGVja2luZyBmb3IgdGhlIGV4Y2VwdGlvbiB0aGVpciBvd24gd2F5IGluc3RlYWQgb2YgY2Fs bGluZyBUaHJvd1Njb3BlOjpleGNlcHRpb24oKS4KLSAgICBpZiAodG9wQ2FsbEZyYW1lICYmIHBy ZXZpb3VzU2NvcGUgPiB0b3BDYWxsRnJhbWUpCisgICAgaWYgKHRvcFZNRW50cnlGcmFtZSAmJiBw cmV2aW91c1Njb3BlID4gdG9wVk1FbnRyeUZyYW1lKQogICAgICAgICB3aWxsQmVIYW5kbGVCeUxM SW50T3JKSVQgPSB0cnVlOwogICAgIAogICAgIGlmICghd2lsbEJlSGFuZGxlQnlMTEludE9ySklU KQo= 290349 2016-09-30 10:51:25 -0700 2016-09-30 11:02:15 -0700 proposed patch. bug-162793.patch text/plain 2379 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA2NjQyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE2LTA5LTMwICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBV c2UgdG9wVk1FbnRyeUZyYW1lIHRvIGRldGVybWluZSB3aGV0aGVyIHRvIHNraXAgdGhlIHJlLXRo cm93IG9mIGEgc2ltdWxhdGVkIHRocm93LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTYyNzkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ2hhbmdlIHRoZSBUaHJvd1Njb3BlIGRlc3RydWN0b3IgdG8gdXNl IHRvcFZNRW50cnlGcmFtZSAoaW5zdGVhZCBvZiB0b3BDYWxsRnJhbWUpCisgICAgICAgIGluIHRo ZSBkZXRlcm1pbmF0aW9uIG9mIHdoZXRoZXIgdG8gc2tpcCB0aGUgcmUtdGhyb3cgb2YgYSBzaW11 bGF0ZWQgdGhyb3cuICBUaGlzCisgICAgICAgIGlzIG5lZWRlZCBiZWNhdXNlIHRoZSB0b3BDYWxs RnJhbWUgaXMgbm90IHVwZGF0ZWQgaW4gb3BlcmF0aW9uQ29uc3RydWN0QXJpdHlDaGVjaygpCisg ICAgICAgIChhbmQgZG9lcyBub3QgbmVlZCB0byBiZSksIHdoZXJlYXMgdG9wVk1FbnRyeUZyYW1l IGlzIGFsd2F5cyB1cGRhdGVkIHByb3Blcmx5LgorICAgICAgICBIZW5jZSwgd2Ugc2hvdWxkIGp1 c3Qgc3dpdGNoIHRvIHVzaW5nIHRoZSBtb3JlIHJlbGlhYmxlIHRvcFZNRW50cnlGcmFtZSBpbnN0 ZWFkLgorCisgICAgICAgIFRoaXMgaXNzdWUgd2FzIGRpc2NvdmVyZWQgYnkgZXhpc3RpbmcgSlND IHRlc3RzIHdoZW4gZXhjZXB0aW9uIGNoZWNrIHZhbGlkYXRpb24KKyAgICAgICAgaXMgZW5hYmxl ZC4KKworICAgICAgICAqIHJ1bnRpbWUvVGhyb3dTY29wZS5jcHA6CisgICAgICAgIChKU0M6OlRo cm93U2NvcGU6On5UaHJvd1Njb3BlKToKKwogMjAxNi0wOS0zMCAgRmlsaXAgUGl6bG8gIDxmcGl6 bG9AYXBwbGUuY29tPgogCiAgICAgICAgIDY0LWJpdCBMTEludCBuZWVkcyB0byBoYXZlIGEgY29u Y3VycmVuY3ktYXdhcmUgYmFycmllcgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvVGhyb3dTY29wZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvVGhyb3dTY29wZS5jcHAJKHJldmlzaW9uIDIwNjYzNykKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL1Rocm93U2NvcGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NywxMyAr NTcsMTMgQEAgVGhyb3dTY29wZTo6flRocm93U2NvcGUoKQogCiAgICAgYm9vbCB3aWxsQmVIYW5k bGVCeUxMSW50T3JKSVQgPSBmYWxzZTsKICAgICB2b2lkKiBwcmV2aW91c1Njb3BlID0gbV9wcmV2 aW91c1Njb3BlOwotICAgIHZvaWQqIHRvcENhbGxGcmFtZSA9IG1fdm0udG9wQ2FsbEZyYW1lOwot ICAgIAotICAgIC8vIElmIHRoZSB0b3BDYWxsRnJhbWUgd2FzIHB1c2hlZCBvbiB0aGUgc3RhY2sg YWZ0ZXIgdGhlIHByZXZpb3VzU2NvcGUgd2FzIGluc3RhbnRpYXRlZCwKKyAgICB2b2lkKiB0b3BW TUVudHJ5RnJhbWUgPSBtX3ZtLnRvcFZNRW50cnlGcmFtZTsKKworICAgIC8vIElmIHRoZSB0b3BW TUVudHJ5RnJhbWUgd2FzIHB1c2hlZCBvbiB0aGUgc3RhY2sgYWZ0ZXIgdGhlIHByZXZpb3VzU2Nv cGUgd2FzIGluc3RhbnRpYXRlZCwKICAgICAvLyB0aGVuIHRoaXMgdGhyb3dTY29wZSB3aWxsIGJl IHJldHVybmluZyB0byBMTElOVCBvciBKSVQgY29kZSB0aGF0IGFsd2F5cyBkbyBhbiBleGNlcHRp b24KICAgICAvLyBjaGVjay4gSW4gdGhhdCBjYXNlLCBza2lwIHRoZSBzaW11bGF0ZWQgdGhyb3cg YmVjYXVzZSB0aGUgTExJbnQgYW5kIEpJVCB3aWxsIGJlCiAgICAgLy8gY2hlY2tpbmcgZm9yIHRo ZSBleGNlcHRpb24gdGhlaXIgb3duIHdheSBpbnN0ZWFkIG9mIGNhbGxpbmcgVGhyb3dTY29wZTo6 ZXhjZXB0aW9uKCkuCi0gICAgaWYgKHRvcENhbGxGcmFtZSAmJiBwcmV2aW91c1Njb3BlID4gdG9w Q2FsbEZyYW1lKQorICAgIGlmICh0b3BWTUVudHJ5RnJhbWUgJiYgcHJldmlvdXNTY29wZSA+IHRv cFZNRW50cnlGcmFtZSkKICAgICAgICAgd2lsbEJlSGFuZGxlQnlMTEludE9ySklUID0gdHJ1ZTsK ICAgICAKICAgICBpZiAoIXdpbGxCZUhhbmRsZUJ5TExJbnRPckpJVCkK