149276 2015-09-17 12:03:44 -0700 Refactor common code between GetCatchHandlerFunctor and UnwindFunctor 2015-09-18 18:27:14 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin fpizlo ggaren keith_miller mark.lam msaboff oliver ysuzuki oldest_to_newest 1126774 0 saam 2015-09-17 12:03:44 -0700 There is a lot of duplicate code between them. We should probably reuse the code, and just add another field to UnwindFunctor to give it a "search" mode that doesn't copyCalleeSaves and also unwinds past VM entry frames. 1126992 1 saam 2015-09-17 18:27:58 -0700 Change of plans. I'm keeping two separate functors and just writing a function to be shared between them. 1127005 2 261472 saam 2015-09-17 18:53:46 -0700 Created attachment 261472 patch 1127132 3 261472 mark.lam 2015-09-18 09:31:54 -0700 Comment on attachment 261472 patch View in context: https://bugs.webkit.org/attachment.cgi?id=261472&action=review Looks good. r=me > Source/JavaScriptCore/ChangeLog:3 > + Abstract some common code between GetCatchHandlerFunctor and UnwindFunctor Do you mean "Extract" instead of "Abstract"? Or perhaps "Refactor common code out of Get...". 1127325 4 saam 2015-09-18 18:27:14 -0700 landed in: http://trac.webkit.org/changeset/190004 261472 2015-09-17 18:53:46 -0700 2015-09-18 09:31:54 -0700 patch c-backup.diff text/plain 6866 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg5OTU2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBA CisyMDE1LTA5LTE3ICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEFic3RyYWN0IHNvbWUgY29tbW9uIGNvZGUgYmV0d2VlbiBHZXRDYXRjaEhhbmRsZXJGdW5jdG9y IGFuZCBVbndpbmRGdW5jdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDkyNzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGVyZSBpcyBjdXJyZW50bHkgY29kZSBjb3B5LXBhc3RlZCBiZXR3ZWVuIHRo ZXNlCisgICAgICAgIHR3byBmdW5jdG9ycy4gTGV0cyBub3QgZG8gdGhhdC4gSXQncyBiZXR0ZXIg dG8gd3JpdGUKKyAgICAgICAgYSBmdW5jdGlvbiwgZXZlbiBpZiB0aGUgZnVuY3Rpb24gaXMgc21h bGwuCisKKyAgICAgICAgSSBhbHNvIGRpZCBhIGJpdCBvZiByZW5hbWluZyB0byBtYWtlIHRoZSBp bnRlbnQgb2YgdGhlCisgICAgICAgIHVud2luZENhbGxGcmFtZSBmdW5jdGlvbiBjbGVhci4gVGhl IG5hbWUgb2YgdGhlIGZ1bmN0aW9uCisgICAgICAgIGRpZG4ndCByZWFsbHkgaW5kaWNhdGUgd2hh dCBpdCBkaWQuIEl0IGRlY2lkZWQgaWYgaXQgd2FzCisgICAgICAgIG9rYXkgdG8gdW53aW5kIGZ1 cnRoZXIsIGFuZCBpdCBhbHNvIG5vdGlmaWVkIHRoZSBkZWJ1Z2dlci4KKyAgICAgICAgSSd2ZSBy ZW5hbWVkIHRoZSBmdW5jdGlvbiB0byBub3RpZnlEZWJ1Z2dlck9mVW53aW5kaW5nLgorICAgICAg ICBBbmQgSSd2ZSBpbmxpbmVkIHRoZSBsb2dpYyBvZiBkZWNpZGluZyBpZiBpdCdzIG9rYXkKKyAg ICAgICAgdG8gdW53aW5kIGZ1cnRoZXIgaW50byBVbndpbmRGdW5jdG9yIGl0c2VsZi4KKworICAg ICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmNwcDoKKyAgICAgICAgKEpTQzo6SW50ZXJw cmV0ZXI6OmlzT3Bjb2RlKToKKyAgICAgICAgKEpTQzo6Z2V0U3RhY2tGcmFtZUNvZGVUeXBlKToK KyAgICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OnN0YWNrVHJhY2VBc1N0cmluZyk6CisgICAgICAg IChKU0M6OmZpbmRFeGNlcHRpb25IYW5kbGVyKToKKyAgICAgICAgKEpTQzo6R2V0Q2F0Y2hIYW5k bGVyRnVuY3Rvcjo6R2V0Q2F0Y2hIYW5kbGVyRnVuY3Rvcik6CisgICAgICAgIChKU0M6OkdldENh dGNoSGFuZGxlckZ1bmN0b3I6Om9wZXJhdG9yKCkpOgorICAgICAgICAoSlNDOjpub3RpZnlEZWJ1 Z2dlck9mVW53aW5kaW5nKToKKyAgICAgICAgKEpTQzo6VW53aW5kRnVuY3Rvcjo6VW53aW5kRnVu Y3Rvcik6CisgICAgICAgIChKU0M6OlVud2luZEZ1bmN0b3I6Om9wZXJhdG9yKCkpOgorICAgICAg ICAoSlNDOjpJbnRlcnByZXRlcjo6bm90aWZ5RGVidWdnZXJPZkV4Y2VwdGlvblRvQmVUaHJvd24p OgorICAgICAgICAoSlNDOjp1bndpbmRDYWxsRnJhbWUpOiBEZWxldGVkLgorCiAyMDE1LTA5LTE3 ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIENMb29wIGJ1aWxk IGZpeCBhZnRlciByMTg5OTM4LgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJl dGVyL0ludGVycHJldGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCShyZXZpc2lvbiAxODk5NTIpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC00MzYsMjIgKzQzNiw2IEBAIGJvb2wgSW50ZXJwcmV0ZXI6OmlzT3Bjb2RlKE9wY29kZSBv cGNvZGUKICNlbmRpZgogfQogCi1zdGF0aWMgYm9vbCB1bndpbmRDYWxsRnJhbWUoU3RhY2tWaXNp dG9yJiB2aXNpdG9yKQotewotICAgIENhbGxGcmFtZSogY2FsbEZyYW1lID0gdmlzaXRvci0+Y2Fs bEZyYW1lKCk7Ci0gICAgaWYgKERlYnVnZ2VyKiBkZWJ1Z2dlciA9IGNhbGxGcmFtZS0+dm1FbnRy eUdsb2JhbE9iamVjdCgpLT5kZWJ1Z2dlcigpKSB7Ci0gICAgICAgIFN1c3BlbmRFeGNlcHRpb25T Y29wZSBzY29wZSgmY2FsbEZyYW1lLT52bSgpKTsKLSAgICAgICAgaWYgKGpzRHluYW1pY0Nhc3Q8 SlNGdW5jdGlvbio+KGNhbGxGcmFtZS0+Y2FsbGVlKCkpKQotICAgICAgICAgICAgZGVidWdnZXIt PnJldHVybkV2ZW50KGNhbGxGcmFtZSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIGRlYnVn Z2VyLT5kaWRFeGVjdXRlUHJvZ3JhbShjYWxsRnJhbWUpOwotICAgICAgICBBU1NFUlQoIWNhbGxG cmFtZS0+aGFkRXhjZXB0aW9uKCkpOwotICAgIH0KLQotICAgIGJvb2wgc2hvdWxkQ29udGludWVV bndpbmRpbmcgPSAhdmlzaXRvci0+Y2FsbGVySXNWTUVudHJ5RnJhbWUoKTsKLSAgICByZXR1cm4g c2hvdWxkQ29udGludWVVbndpbmRpbmc7Ci19Ci0KIHN0YXRpYyBTdGFja0ZyYW1lQ29kZVR5cGUg Z2V0U3RhY2tGcmFtZUNvZGVUeXBlKFN0YWNrVmlzaXRvciYgdmlzaXRvcikKIHsKICAgICBzd2l0 Y2ggKHZpc2l0b3ItPmNvZGVUeXBlKCkpIHsKQEAgLTYwMyw2ICs1ODcsMjMgQEAgSlNTdHJpbmcq IEludGVycHJldGVyOjpzdGFja1RyYWNlQXNTdHJpbgogICAgIHJldHVybiBqc1N0cmluZygmZXhl Yy0+dm0oKSwgYnVpbGRlci50b1N0cmluZygpKTsKIH0KIAorQUxXQVlTX0lOTElORSBzdGF0aWMg SGFuZGxlckluZm8qIGZpbmRFeGNlcHRpb25IYW5kbGVyKFN0YWNrVmlzaXRvciYgdmlzaXRvciwg Q29kZUJsb2NrKiBjb2RlQmxvY2ssIENvZGVCbG9jazo6UmVxdWlyZWRIYW5kbGVyIHJlcXVpcmVk SGFuZGxlcikKK3sKKyAgICBBU1NFUlQoY29kZUJsb2NrKTsKKyNpZiBFTkFCTEUoREZHX0pJVCkK KyAgICBBU1NFUlQoIXZpc2l0b3ItPmlzSW5saW5lZEZyYW1lKCkpOworI2VuZGlmCisKKyAgICBD YWxsRnJhbWUqIGNhbGxGcmFtZSA9IHZpc2l0b3ItPmNhbGxGcmFtZSgpOworICAgIHVuc2lnbmVk IGV4Y2VwdGlvbkhhbmRsZXJJbmRleDsKKyAgICBpZiAoY29kZUJsb2NrLT5qaXRUeXBlKCkgIT0g SklUQ29kZTo6REZHSklUKQorICAgICAgICBleGNlcHRpb25IYW5kbGVySW5kZXggPSBjYWxsRnJh bWUtPmJ5dGVjb2RlT2Zmc2V0KCk7CisgICAgZWxzZQorICAgICAgICBleGNlcHRpb25IYW5kbGVy SW5kZXggPSBjYWxsRnJhbWUtPmNhbGxTaXRlSW5kZXgoKS5iaXRzKCk7CisKKyAgICByZXR1cm4g Y29kZUJsb2NrLT5oYW5kbGVyRm9ySW5kZXgoZXhjZXB0aW9uSGFuZGxlckluZGV4LCByZXF1aXJl ZEhhbmRsZXIpOworfQorCiBjbGFzcyBHZXRDYXRjaEhhbmRsZXJGdW5jdG9yIHsKIHB1YmxpYzoK ICAgICBHZXRDYXRjaEhhbmRsZXJGdW5jdG9yKCkKQEAgLTYyMCwxMyArNjIxLDcgQEAgcHVibGlj OgogICAgICAgICBpZiAoIWNvZGVCbG9jaykKICAgICAgICAgICAgIHJldHVybiBTdGFja1Zpc2l0 b3I6OkNvbnRpbnVlOwogCi0gICAgICAgIHVuc2lnbmVkIGV4Y2VwdGlvbkhhbmRsZXJJbmRleDsK LSAgICAgICAgaWYgKGNvZGVCbG9jay0+aml0VHlwZSgpICE9IEpJVENvZGU6OkRGR0pJVCkKLSAg ICAgICAgICAgIGV4Y2VwdGlvbkhhbmRsZXJJbmRleCA9IHZpc2l0b3ItPmNhbGxGcmFtZSgpLT5i eXRlY29kZU9mZnNldCgpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBleGNlcHRpb25IYW5k bGVySW5kZXggPSB2aXNpdG9yLT5jYWxsRnJhbWUoKS0+Y2FsbFNpdGVJbmRleCgpLmJpdHMoKTsK LQotICAgICAgICBtX2hhbmRsZXIgPSBjb2RlQmxvY2stPmhhbmRsZXJGb3JJbmRleChleGNlcHRp b25IYW5kbGVySW5kZXgsIENvZGVCbG9jazo6UmVxdWlyZWRIYW5kbGVyOjpDYXRjaEhhbmRsZXIp OworICAgICAgICBtX2hhbmRsZXIgPSBmaW5kRXhjZXB0aW9uSGFuZGxlcih2aXNpdG9yLCBjb2Rl QmxvY2ssIENvZGVCbG9jazo6UmVxdWlyZWRIYW5kbGVyOjpDYXRjaEhhbmRsZXIpOwogICAgICAg ICBpZiAobV9oYW5kbGVyKQogICAgICAgICAgICAgcmV0dXJuIFN0YWNrVmlzaXRvcjo6RG9uZTsK IApAQCAtNjM3LDYgKzYzMiwxOCBAQCBwcml2YXRlOgogICAgIEhhbmRsZXJJbmZvKiBtX2hhbmRs ZXI7CiB9OwogCitBTFdBWVNfSU5MSU5FIHN0YXRpYyB2b2lkIG5vdGlmeURlYnVnZ2VyT2ZVbndp bmRpbmcoQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCit7CisgICAgaWYgKERlYnVnZ2VyKiBkZWJ1Z2dl ciA9IGNhbGxGcmFtZS0+dm1FbnRyeUdsb2JhbE9iamVjdCgpLT5kZWJ1Z2dlcigpKSB7CisgICAg ICAgIFN1c3BlbmRFeGNlcHRpb25TY29wZSBzY29wZSgmY2FsbEZyYW1lLT52bSgpKTsKKyAgICAg ICAgaWYgKGpzRHluYW1pY0Nhc3Q8SlNGdW5jdGlvbio+KGNhbGxGcmFtZS0+Y2FsbGVlKCkpKQor ICAgICAgICAgICAgZGVidWdnZXItPnJldHVybkV2ZW50KGNhbGxGcmFtZSk7CisgICAgICAgIGVs c2UKKyAgICAgICAgICAgIGRlYnVnZ2VyLT5kaWRFeGVjdXRlUHJvZ3JhbShjYWxsRnJhbWUpOwor ICAgICAgICBBU1NFUlQoIWNhbGxGcmFtZS0+aGFkRXhjZXB0aW9uKCkpOworICAgIH0KK30KKwog Y2xhc3MgVW53aW5kRnVuY3RvciB7CiBwdWJsaWM6CiAgICAgVW53aW5kRnVuY3RvcihDYWxsRnJh bWUqJiBjYWxsRnJhbWUsIGJvb2wgaXNUZXJtaW5hdGlvbiwgQ29kZUJsb2NrKiYgY29kZUJsb2Nr LCBIYW5kbGVySW5mbyomIGhhbmRsZXIpCkBAIC02NTQsMjIgKzY2MSwxOSBAQCBwdWJsaWM6CiAg ICAgICAgIG1fY2FsbEZyYW1lID0gdmlzaXRvci0+Y2FsbEZyYW1lKCk7CiAgICAgICAgIG1fY29k ZUJsb2NrID0gdmlzaXRvci0+Y29kZUJsb2NrKCk7CiAKLSAgICAgICAgdW5zaWduZWQgZXhjZXB0 aW9uSGFuZGxlckluZGV4OwotICAgICAgICBpZiAobV9jb2RlQmxvY2stPmppdFR5cGUoKSAhPSBK SVRDb2RlOjpERkdKSVQpCi0gICAgICAgICAgICBleGNlcHRpb25IYW5kbGVySW5kZXggPSBtX2Nh bGxGcmFtZS0+Ynl0ZWNvZGVPZmZzZXQoKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgZXhj ZXB0aW9uSGFuZGxlckluZGV4ID0gbV9jYWxsRnJhbWUtPmNhbGxTaXRlSW5kZXgoKS5iaXRzKCk7 CiAgICAgICAgIG1faGFuZGxlciA9IG51bGxwdHI7CiAgICAgICAgIGlmICghbV9pc1Rlcm1pbmF0 aW9uKSB7CiAgICAgICAgICAgICBpZiAobV9jb2RlQmxvY2sgJiYgIWlzV2ViQXNzZW1ibHlFeGVj dXRhYmxlKG1fY29kZUJsb2NrLT5vd25lckV4ZWN1dGFibGUoKSkpCi0gICAgICAgICAgICAgICAg bV9oYW5kbGVyID0gbV9jb2RlQmxvY2stPmhhbmRsZXJGb3JJbmRleChleGNlcHRpb25IYW5kbGVy SW5kZXgpOworICAgICAgICAgICAgICAgIG1faGFuZGxlciA9IGZpbmRFeGNlcHRpb25IYW5kbGVy KHZpc2l0b3IsIG1fY29kZUJsb2NrLCBDb2RlQmxvY2s6OlJlcXVpcmVkSGFuZGxlcjo6QW55SGFu ZGxlcik7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAobV9oYW5kbGVyKQogICAgICAgICAgICAg cmV0dXJuIFN0YWNrVmlzaXRvcjo6RG9uZTsKIAotICAgICAgICBib29sIHNob3VsZENvbnRpbnVl VW53aW5kaW5nID0gdW53aW5kQ2FsbEZyYW1lKHZpc2l0b3IpOwotICAgICAgICBpZiAoIXNob3Vs ZENvbnRpbnVlVW53aW5kaW5nKSB7CisgICAgICAgIG5vdGlmeURlYnVnZ2VyT2ZVbndpbmRpbmco bV9jYWxsRnJhbWUpOworCisgICAgICAgIGJvb2wgc2hvdWxkU3RvcFVud2luZGluZyA9IHZpc2l0 b3ItPmNhbGxlcklzVk1FbnRyeUZyYW1lKCk7CisgICAgICAgIGlmIChzaG91bGRTdG9wVW53aW5k aW5nKSB7CiAgICAgICAgICAgICBpZiAoTGVnYWN5UHJvZmlsZXIqIHByb2ZpbGVyID0gdm0uZW5h YmxlZFByb2ZpbGVyKCkpCiAgICAgICAgICAgICAgICAgcHJvZmlsZXItPmV4Y2VwdGlvblVud2lu ZChtX2NhbGxGcmFtZSk7CiAKQEAgLTc1OSw3ICs3NjMsNiBAQCBORVZFUl9JTkxJTkUgSGFuZGxl ckluZm8qIEludGVycHJldGVyOjp1CiAKIHZvaWQgSW50ZXJwcmV0ZXI6Om5vdGlmeURlYnVnZ2Vy T2ZFeGNlcHRpb25Ub0JlVGhyb3duKENhbGxGcmFtZSogY2FsbEZyYW1lLCBFeGNlcHRpb24qIGV4 Y2VwdGlvbikKIHsKLSAgICBib29sIGlzVGVybWluYXRpb24gPSBpc1Rlcm1pbmF0ZWRFeGVjdXRp b25FeGNlcHRpb24oZXhjZXB0aW9uKTsKICAgICBEZWJ1Z2dlciogZGVidWdnZXIgPSBjYWxsRnJh bWUtPnZtRW50cnlHbG9iYWxPYmplY3QoKS0+ZGVidWdnZXIoKTsKICAgICBpZiAoZGVidWdnZXIg JiYgZGVidWdnZXItPm5lZWRzRXhjZXB0aW9uQ2FsbGJhY2tzKCkgJiYgIWV4Y2VwdGlvbi0+ZGlk Tm90aWZ5SW5zcGVjdG9yT2ZUaHJvdygpKSB7CiAgICAgICAgIC8vIFRoaXMgY29kZSBhc3N1bWVz IHRoYXQgaWYgdGhlIGRlYnVnZ2VyIGlzIGVuYWJsZWQgdGhlbiB0aGVyZSBpcyBubyBpbmxpbmlu Zy4KQEAgLTc2OCw2ICs3NzEsNyBAQCB2b2lkIEludGVycHJldGVyOjpub3RpZnlEZWJ1Z2dlck9m RXhjZXB0CiAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjE3NTQKIAogICAgICAgICBib29sIGhhc0NhdGNoSGFuZGxlcjsKKyAgICAgICAgYm9vbCBp c1Rlcm1pbmF0aW9uID0gaXNUZXJtaW5hdGVkRXhlY3V0aW9uRXhjZXB0aW9uKGV4Y2VwdGlvbik7 CiAgICAgICAgIGlmIChpc1Rlcm1pbmF0aW9uKQogICAgICAgICAgICAgaGFzQ2F0Y2hIYW5kbGVy ID0gZmFsc2U7CiAgICAgICAgIGVsc2Ugewo=