136978 2014-09-20 12:54:59 -0700 FTL OSRExit construction should be based on methods that return ExitValues rather than methods that add ExitValues to OSRExit 2014-09-20 14:52:40 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 136330 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenb msaboff nrotem oliver sam oldest_to_newest 1036313 0 fpizlo 2014-09-20 12:54:59 -0700 Patch forthcoming. 1036314 1 238416 fpizlo 2014-09-20 13:04:30 -0700 Created attachment 238416 the patch 1036317 2 fpizlo 2014-09-20 14:52:40 -0700 Landed in http://trac.webkit.org/changeset/173795 238416 2014-09-20 13:04:30 -0700 2014-09-20 14:36:26 -0700 the patch blah.patch text/plain 6352 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTczNzk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE0LTA5LTIwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg RlRMIE9TUkV4aXQgY29uc3RydWN0aW9uIHNob3VsZCBiZSBiYXNlZCBvbiBtZXRob2RzIHRoYXQg cmV0dXJuIEV4aXRWYWx1ZXMgcmF0aGVyIHRoYW4gbWV0aG9kcyB0aGF0IGFkZCBFeGl0VmFsdWVz IHRvIE9TUkV4aXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzNjk3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dl ckRGR1RvTExWTTo6YnVpbGRFeGl0QXJndW1lbnRzKToKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dl ckRGR1RvTExWTTo6ZXhpdFZhbHVlRm9yTm9kZSk6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJE RkdUb0xMVk06OmV4aXRBcmd1bWVudCk6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJERkdUb0xM Vk06OmFkZEV4aXRBcmd1bWVudEZvck5vZGUpOiBEZWxldGVkLgorICAgICAgICAoSlNDOjpGVEw6 Okxvd2VyREZHVG9MTFZNOjp0cnlUb1NldENvbnN0YW50RXhpdEFyZ3VtZW50KTogRGVsZXRlZC4K KyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1RvTExWTTo6YWRkRXhpdEFyZ3VtZW50KTogRGVs ZXRlZC4KKwogMjAxNC0wOS0yMCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAg ICAgICAgIEZUTCBPU1IgZXhpdCBzaG91bGQgZG8gcmVib3hpbmcgYW5kIHZhbHVlIHJlY292ZXJ5 IGluIHRoZSBzYW1lIHBhc3MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93 ZXJERkdUb0xMVk0uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwv RlRMTG93ZXJERkdUb0xMVk0uY3BwCShyZXZpc2lvbiAxNzM3OTMpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjQw OCw3ICs2NDA4LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIGNhc2UgRGVhZEZsdXNoOgogICAg ICAgICAgICAgY2FzZSBDb25mbGljdGluZ0ZsdXNoOgogICAgICAgICAgICAgICAgIGlmIChhdmFp bGFiaWxpdHkuaGFzTm9kZSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGFkZEV4aXRBcmd1bWVu dEZvck5vZGUoZXhpdCwgYXJndW1lbnRzLCBpLCBhdmFpbGFiaWxpdHkubm9kZSgpKTsKKyAgICAg ICAgICAgICAgICAgICAgZXhpdC5tX3ZhbHVlc1tpXSA9IGV4aXRWYWx1ZUZvck5vZGUoYXJndW1l bnRzLCBhdmFpbGFiaWxpdHkubm9kZSgpKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIApAQCAtNjQ1OSw5MyArNjQ1OSw3MyBA QCBwcml2YXRlOgogICAgICAgICBtX291dC5jYWxsKG1fb3V0LnN0YWNrbWFwSW50cmluc2ljKCks IGFyZ3VtZW50cyk7CiAgICAgfQogICAgIAotICAgIHZvaWQgYWRkRXhpdEFyZ3VtZW50Rm9yTm9k ZSgKLSAgICAgICAgT1NSRXhpdCYgZXhpdCwgRXhpdEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCB1 bnNpZ25lZCBpbmRleCwgTm9kZSogbm9kZSkKKyAgICBFeGl0VmFsdWUgZXhpdFZhbHVlRm9yTm9k ZShFeGl0QXJndW1lbnRMaXN0JiBhcmd1bWVudHMsIE5vZGUqIG5vZGUpCiAgICAgewogICAgICAg ICBBU1NFUlQobm9kZS0+c2hvdWxkR2VuZXJhdGUoKSk7CiAgICAgICAgIEFTU0VSVChub2RlLT5o YXNSZXN1bHQoKSk7CiAKLSAgICAgICAgaWYgKHRyeVRvU2V0Q29uc3RhbnRFeGl0QXJndW1lbnQo ZXhpdCwgaW5kZXgsIG5vZGUpKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAobm9k ZSkgeworICAgICAgICAgICAgc3dpdGNoIChub2RlLT5vcCgpKSB7CisgICAgICAgICAgICBjYXNl IEpTQ29uc3RhbnQ6CisgICAgICAgICAgICBjYXNlIEludDUyQ29uc3RhbnQ6CisgICAgICAgICAg ICBjYXNlIERvdWJsZUNvbnN0YW50OgorICAgICAgICAgICAgICAgIHJldHVybiBFeGl0VmFsdWU6 OmNvbnN0YW50KG5vZGUtPmFzSlNWYWx1ZSgpKTsKKyAgICAgICAgICAgICAgICAKKyAgICAgICAg ICAgIGNhc2UgUGhhbnRvbUFyZ3VtZW50czoKKyAgICAgICAgICAgICAgICByZXR1cm4gRXhpdFZh bHVlOjphcmd1bWVudHNPYmplY3RUaGF0V2FzTm90Q3JlYXRlZCgpOworICAgICAgICAgICAgICAg IAorICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfQogICAgICAgICAKICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsg aSA8IG1fYXZhaWxhYmxlUmVjb3Zlcmllcy5zaXplKCk7ICsraSkgewogICAgICAgICAgICAgQXZh aWxhYmxlUmVjb3ZlcnkgcmVjb3ZlcnkgPSBtX2F2YWlsYWJsZVJlY292ZXJpZXNbaV07CiAgICAg ICAgICAgICBpZiAocmVjb3Zlcnkubm9kZSgpICE9IG5vZGUpCiAgICAgICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGV4aXQubV92YWx1ZXNbaW5kZXhdID0g RXhpdFZhbHVlOjpyZWNvdmVyeSgKKyAgICAgICAgICAgIEV4aXRWYWx1ZSByZXN1bHQgPSBFeGl0 VmFsdWU6OnJlY292ZXJ5KAogICAgICAgICAgICAgICAgIHJlY292ZXJ5Lm9wY29kZSgpLCBhcmd1 bWVudHMuc2l6ZSgpLCBhcmd1bWVudHMuc2l6ZSgpICsgMSwKICAgICAgICAgICAgICAgICByZWNv dmVyeS5mb3JtYXQoKSk7CiAgICAgICAgICAgICBhcmd1bWVudHMuYXBwZW5kKHJlY292ZXJ5Lmxl ZnQoKSk7CiAgICAgICAgICAgICBhcmd1bWVudHMuYXBwZW5kKHJlY292ZXJ5LnJpZ2h0KCkpOwot ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAg fQogICAgICAgICAKICAgICAgICAgTG93ZXJlZE5vZGVWYWx1ZSB2YWx1ZSA9IG1faW50MzJWYWx1 ZXMuZ2V0KG5vZGUpOwotICAgICAgICBpZiAoaXNWYWxpZCh2YWx1ZSkpIHsKLSAgICAgICAgICAg IGFkZEV4aXRBcmd1bWVudChleGl0LCBhcmd1bWVudHMsIGluZGV4LCBWYWx1ZUZvcm1hdEludDMy LCB2YWx1ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgICAg ICBpZiAoaXNWYWxpZCh2YWx1ZSkpCisgICAgICAgICAgICByZXR1cm4gZXhpdEFyZ3VtZW50KGFy Z3VtZW50cywgVmFsdWVGb3JtYXRJbnQzMiwgdmFsdWUudmFsdWUoKSk7CiAgICAgICAgIAogICAg ICAgICB2YWx1ZSA9IG1faW50NTJWYWx1ZXMuZ2V0KG5vZGUpOwotICAgICAgICBpZiAoaXNWYWxp ZCh2YWx1ZSkpIHsKLSAgICAgICAgICAgIGFkZEV4aXRBcmd1bWVudChleGl0LCBhcmd1bWVudHMs IGluZGV4LCBWYWx1ZUZvcm1hdEludDUyLCB2YWx1ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQorICAgICAgICBpZiAoaXNWYWxpZCh2YWx1ZSkpCisgICAgICAgICAg ICByZXR1cm4gZXhpdEFyZ3VtZW50KGFyZ3VtZW50cywgVmFsdWVGb3JtYXRJbnQ1MiwgdmFsdWUu dmFsdWUoKSk7CiAgICAgICAgIAogICAgICAgICB2YWx1ZSA9IG1fc3RyaWN0SW50NTJWYWx1ZXMu Z2V0KG5vZGUpOwotICAgICAgICBpZiAoaXNWYWxpZCh2YWx1ZSkpIHsKLSAgICAgICAgICAgIGFk ZEV4aXRBcmd1bWVudChleGl0LCBhcmd1bWVudHMsIGluZGV4LCBWYWx1ZUZvcm1hdFN0cmljdElu dDUyLCB2YWx1ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAg ICAgICBpZiAoaXNWYWxpZCh2YWx1ZSkpCisgICAgICAgICAgICByZXR1cm4gZXhpdEFyZ3VtZW50 KGFyZ3VtZW50cywgVmFsdWVGb3JtYXRTdHJpY3RJbnQ1MiwgdmFsdWUudmFsdWUoKSk7CiAgICAg ICAgIAogICAgICAgICB2YWx1ZSA9IG1fYm9vbGVhblZhbHVlcy5nZXQobm9kZSk7CiAgICAgICAg IGlmIChpc1ZhbGlkKHZhbHVlKSkgewogICAgICAgICAgICAgTFZhbHVlIHZhbHVlVG9QYXNzID0g bV9vdXQuemVyb0V4dCh2YWx1ZS52YWx1ZSgpLCBtX291dC5pbnQzMik7Ci0gICAgICAgICAgICBh ZGRFeGl0QXJndW1lbnQoZXhpdCwgYXJndW1lbnRzLCBpbmRleCwgVmFsdWVGb3JtYXRCb29sZWFu LCB2YWx1ZVRvUGFzcyk7Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4g ZXhpdEFyZ3VtZW50KGFyZ3VtZW50cywgVmFsdWVGb3JtYXRCb29sZWFuLCB2YWx1ZVRvUGFzcyk7 CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIHZhbHVlID0gbV9qc1ZhbHVlVmFsdWVzLmdl dChub2RlKTsKLSAgICAgICAgaWYgKGlzVmFsaWQodmFsdWUpKSB7Ci0gICAgICAgICAgICBhZGRF eGl0QXJndW1lbnQoZXhpdCwgYXJndW1lbnRzLCBpbmRleCwgVmFsdWVGb3JtYXRKU1ZhbHVlLCB2 YWx1ZS52YWx1ZSgpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgICAgICBp ZiAoaXNWYWxpZCh2YWx1ZSkpCisgICAgICAgICAgICByZXR1cm4gZXhpdEFyZ3VtZW50KGFyZ3Vt ZW50cywgVmFsdWVGb3JtYXRKU1ZhbHVlLCB2YWx1ZS52YWx1ZSgpKTsKICAgICAgICAgCiAgICAg ICAgIHZhbHVlID0gbV9kb3VibGVWYWx1ZXMuZ2V0KG5vZGUpOwotICAgICAgICBpZiAoaXNWYWxp ZCh2YWx1ZSkpIHsKLSAgICAgICAgICAgIGFkZEV4aXRBcmd1bWVudChleGl0LCBhcmd1bWVudHMs IGluZGV4LCBWYWx1ZUZvcm1hdERvdWJsZSwgdmFsdWUudmFsdWUoKSk7Ci0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKGlzVmFsaWQodmFsdWUpKQorICAgICAgICAg ICAgcmV0dXJuIGV4aXRBcmd1bWVudChhcmd1bWVudHMsIFZhbHVlRm9ybWF0RG91YmxlLCB2YWx1 ZS52YWx1ZSgpKTsKIAogICAgICAgICBERkdfQ1JBU0gobV9ncmFwaCwgbV9ub2RlLCB0b0NTdHJp bmcoIkNhbm5vdCBmaW5kIHZhbHVlIGZvciBub2RlOiAiLCBub2RlKS5kYXRhKCkpOwogICAgIH0K ICAgICAKLSAgICBib29sIHRyeVRvU2V0Q29uc3RhbnRFeGl0QXJndW1lbnQoT1NSRXhpdCYgZXhp dCwgdW5zaWduZWQgaW5kZXgsIE5vZGUqIG5vZGUpCi0gICAgewotICAgICAgICBpZiAoIW5vZGUp Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIAotICAgICAgICBzd2l0Y2ggKG5v ZGUtPm9wKCkpIHsKLSAgICAgICAgY2FzZSBKU0NvbnN0YW50OgotICAgICAgICBjYXNlIEludDUy Q29uc3RhbnQ6Ci0gICAgICAgIGNhc2UgRG91YmxlQ29uc3RhbnQ6Ci0gICAgICAgICAgICBleGl0 Lm1fdmFsdWVzW2luZGV4XSA9IEV4aXRWYWx1ZTo6Y29uc3RhbnQobm9kZS0+YXNKU1ZhbHVlKCkp OwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIGNhc2UgUGhhbnRvbUFyZ3VtZW50 czoKLSAgICAgICAgICAgIGV4aXQubV92YWx1ZXNbaW5kZXhdID0gRXhpdFZhbHVlOjphcmd1bWVu dHNPYmplY3RUaGF0V2FzTm90Q3JlYXRlZCgpOwotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0g ICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAg ICB9Ci0gICAgCi0gICAgdm9pZCBhZGRFeGl0QXJndW1lbnQoCi0gICAgICAgIE9TUkV4aXQmIGV4 aXQsIEV4aXRBcmd1bWVudExpc3QmIGFyZ3VtZW50cywgdW5zaWduZWQgaW5kZXgsIFZhbHVlRm9y bWF0IGZvcm1hdCwKLSAgICAgICAgTFZhbHVlIHZhbHVlKQorICAgIEV4aXRWYWx1ZSBleGl0QXJn dW1lbnQoRXhpdEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBWYWx1ZUZvcm1hdCBmb3JtYXQsIExW YWx1ZSB2YWx1ZSkKICAgICB7Ci0gICAgICAgIGV4aXQubV92YWx1ZXNbaW5kZXhdID0gRXhpdFZh bHVlOjpleGl0QXJndW1lbnQoRXhpdEFyZ3VtZW50KGZvcm1hdCwgYXJndW1lbnRzLnNpemUoKSkp OworICAgICAgICBFeGl0VmFsdWUgcmVzdWx0ID0gRXhpdFZhbHVlOjpleGl0QXJndW1lbnQoRXhp dEFyZ3VtZW50KGZvcm1hdCwgYXJndW1lbnRzLnNpemUoKSkpOwogICAgICAgICBhcmd1bWVudHMu YXBwZW5kKHZhbHVlKTsKKyAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CiAgICAgCiAgICAg Ym9vbCBkb2VzS2lsbChFZGdlIGVkZ2UpCg==