183399 2018-03-07 00:44:37 -0800 Simplify the variants of FunctionPtr constructors. 2018-03-07 10:27:57 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam commit-queue ews-watchlist fpizlo jfbastien keith_miller msaboff rmorisset saam webkit-bug-importer ysuzuki oldest_to_newest 1404289 0 mark.lam 2018-03-07 00:44:37 -0800 We should able to use a templatized constructor instead of explicitly declaring variants based on function prototypes. 1404290 1 webkit-bug-importer 2018-03-07 00:45:05 -0800 <rdar://problem/38212980> 1404292 2 335177 mark.lam 2018-03-07 00:58:23 -0800 Created attachment 335177 proposed patch. 1404346 3 335177 ysuzuki 2018-03-07 08:03:03 -0800 Comment on attachment 335177 proposed patch. Nice, r=me. 1404375 4 335177 mark.lam 2018-03-07 09:43:12 -0800 Comment on attachment 335177 proposed patch. Thanks for the review. Let's land this. 1404393 5 335177 commit-queue 2018-03-07 10:21:45 -0800 Comment on attachment 335177 proposed patch. Rejecting attachment 335177 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 335177, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: st, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. error: The last gc run reported the following. Please correct the root cause and remove /Volumes/Data/EWS/WebKit/.git/gc.log. Automatic cleanup will not be performed until the file is removed. warning: There are too many unreachable loose objects; run 'git prune' to remove them. Full output: http://webkit-queues.webkit.org/results/6841108 1404394 6 mark.lam 2018-03-07 10:27:57 -0800 Landed in r229367: <https://trac.webkit.org/r229367>. 335177 2018-03-07 00:58:23 -0800 2018-03-07 10:21:45 -0800 proposed patch. bug-183399.patch text/plain 7040 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjI5MzU0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE4LTAzLTA3ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBT aW1wbGlmeSB0aGUgdmFyaWFudHMgb2YgRnVuY3Rpb25QdHIgY29uc3RydWN0b3JzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMzk5CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8zODIxMjk4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGFzc2VtYmxlci9NYWNyb0Fzc2VtYmxlckNvZGVSZWYuaDoK KyAgICAgICAgKEpTQzo6RnVuY3Rpb25QdHI6OkZ1bmN0aW9uUHRyKToKKwogMjAxOC0wMy0wNiAg TWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUHJlcGFyZSBMTEludCBj b2RlIHRvIHN1cHBvcnQgcG9pbnRlciBwcm9maWxpbmcuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyQ29kZVJlZi5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXJDb2RlUmVmLmgJKHJl dmlzaW9uIDIyOTM1NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9B c3NlbWJsZXJDb2RlUmVmLmgJKHdvcmtpbmcgY29weSkKQEAgLTYzLDE0OCArNjMsMzkgQEAgY2xh c3MgRnVuY3Rpb25QdHIgewogcHVibGljOgogICAgIEZ1bmN0aW9uUHRyKCkgeyB9CiAKLSAgICB0 ZW1wbGF0ZTx0eXBlbmFtZSByZXR1cm5UeXBlPgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUo KnZhbHVlKSgpKQotICAgICAgICA6IG1fdmFsdWUoKHZvaWQqKXZhbHVlKQotICAgIHsKLSAgICAg ICAgUG9pc29uZWRNYXNtUHRyOjphc3NlcnRJc05vdFBvaXNvbmVkKG1fdmFsdWUpOwotICAgICAg ICBBU1NFUlRfVkFMSURfQ09ERV9QT0lOVEVSKG1fdmFsdWUpOwotICAgIH0KLQotICAgIHRlbXBs YXRlPHR5cGVuYW1lIHJldHVyblR5cGUsIHR5cGVuYW1lIGFyZ1R5cGUxPgotICAgIEZ1bmN0aW9u UHRyKHJldHVyblR5cGUoKnZhbHVlKShhcmdUeXBlMSkpCi0gICAgICAgIDogbV92YWx1ZSgodm9p ZCopdmFsdWUpCi0gICAgewotICAgICAgICBQb2lzb25lZE1hc21QdHI6OmFzc2VydElzTm90UG9p c29uZWQobV92YWx1ZSk7Ci0gICAgICAgIEFTU0VSVF9WQUxJRF9DT0RFX1BPSU5URVIobV92YWx1 ZSk7Ci0gICAgfQotCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgcmV0dXJuVHlwZSwgdHlwZW5hbWUg YXJnVHlwZTEsIHR5cGVuYW1lIGFyZ1R5cGUyPgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUo KnZhbHVlKShhcmdUeXBlMSwgYXJnVHlwZTIpKQotICAgICAgICA6IG1fdmFsdWUoKHZvaWQqKXZh bHVlKQorICAgIHRlbXBsYXRlPHR5cGVuYW1lIHJldHVyblR5cGUsIHR5cGVuYW1lLi4uIEFyZ3Vt ZW50cz4KKyAgICBGdW5jdGlvblB0cihyZXR1cm5UeXBlKCp2YWx1ZSkoQXJndW1lbnRzLi4uKSkK KyAgICAgICAgOiBtX3ZhbHVlKHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KHZhbHVlKSkKICAgICB7 CiAgICAgICAgIFBvaXNvbmVkTWFzbVB0cjo6YXNzZXJ0SXNOb3RQb2lzb25lZChtX3ZhbHVlKTsK ICAgICAgICAgQVNTRVJUX1ZBTElEX0NPREVfUE9JTlRFUihtX3ZhbHVlKTsKICAgICB9CiAKLSAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSByZXR1cm5UeXBlLCB0eXBlbmFtZSBhcmdUeXBlMSwgdHlwZW5h bWUgYXJnVHlwZTIsIHR5cGVuYW1lIGFyZ1R5cGUzPgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5 cGUoKnZhbHVlKShhcmdUeXBlMSwgYXJnVHlwZTIsIGFyZ1R5cGUzKSkKLSAgICAgICAgOiBtX3Zh bHVlKCh2b2lkKil2YWx1ZSkKLSAgICB7Ci0gICAgICAgIFBvaXNvbmVkTWFzbVB0cjo6YXNzZXJ0 SXNOb3RQb2lzb25lZChtX3ZhbHVlKTsKLSAgICAgICAgQVNTRVJUX1ZBTElEX0NPREVfUE9JTlRF UihtX3ZhbHVlKTsKLSAgICB9Ci0KLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSByZXR1cm5UeXBlLCB0 eXBlbmFtZSBhcmdUeXBlMSwgdHlwZW5hbWUgYXJnVHlwZTIsIHR5cGVuYW1lIGFyZ1R5cGUzLCB0 eXBlbmFtZSBhcmdUeXBlND4KLSAgICBGdW5jdGlvblB0cihyZXR1cm5UeXBlKCp2YWx1ZSkoYXJn VHlwZTEsIGFyZ1R5cGUyLCBhcmdUeXBlMywgYXJnVHlwZTQpKQotICAgICAgICA6IG1fdmFsdWUo KHZvaWQqKXZhbHVlKQotICAgIHsKLSAgICAgICAgUG9pc29uZWRNYXNtUHRyOjphc3NlcnRJc05v dFBvaXNvbmVkKG1fdmFsdWUpOwotICAgICAgICBBU1NFUlRfVkFMSURfQ09ERV9QT0lOVEVSKG1f dmFsdWUpOwotICAgIH0KLQotICAgIHRlbXBsYXRlPHR5cGVuYW1lIHJldHVyblR5cGUsIHR5cGVu YW1lIGFyZ1R5cGUxLCB0eXBlbmFtZSBhcmdUeXBlMiwgdHlwZW5hbWUgYXJnVHlwZTMsIHR5cGVu YW1lIGFyZ1R5cGU0LCB0eXBlbmFtZSBhcmdUeXBlNT4KLSAgICBGdW5jdGlvblB0cihyZXR1cm5U eXBlKCp2YWx1ZSkoYXJnVHlwZTEsIGFyZ1R5cGUyLCBhcmdUeXBlMywgYXJnVHlwZTQsIGFyZ1R5 cGU1KSkKLSAgICAgICAgOiBtX3ZhbHVlKCh2b2lkKil2YWx1ZSkKLSAgICB7Ci0gICAgICAgIFBv aXNvbmVkTWFzbVB0cjo6YXNzZXJ0SXNOb3RQb2lzb25lZChtX3ZhbHVlKTsKLSAgICAgICAgQVNT RVJUX1ZBTElEX0NPREVfUE9JTlRFUihtX3ZhbHVlKTsKLSAgICB9Ci0KLSAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSByZXR1cm5UeXBlLCB0eXBlbmFtZSBhcmdUeXBlMSwgdHlwZW5hbWUgYXJnVHlwZTIs IHR5cGVuYW1lIGFyZ1R5cGUzLCB0eXBlbmFtZSBhcmdUeXBlNCwgdHlwZW5hbWUgYXJnVHlwZTUs IHR5cGVuYW1lIGFyZ1R5cGU2PgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUoKnZhbHVlKShh cmdUeXBlMSwgYXJnVHlwZTIsIGFyZ1R5cGUzLCBhcmdUeXBlNCwgYXJnVHlwZTUsIGFyZ1R5cGU2 KSkKLSAgICAgICAgOiBtX3ZhbHVlKCh2b2lkKil2YWx1ZSkKLSAgICB7Ci0gICAgICAgIFBvaXNv bmVkTWFzbVB0cjo6YXNzZXJ0SXNOb3RQb2lzb25lZChtX3ZhbHVlKTsKLSAgICAgICAgQVNTRVJU X1ZBTElEX0NPREVfUE9JTlRFUihtX3ZhbHVlKTsKLSAgICB9CiAvLyBNU1ZDIGRvZXNuJ3Qgc2Vl bSB0byB0cmVhdCBmdW5jdGlvbnMgd2l0aCBkaWZmZXJlbnQgY2FsbGluZyBjb252ZW50aW9ucyBh cwogLy8gZGlmZmVyZW50IHR5cGVzOyB0aGVzZSBtZXRob2RzIGFscmVhZHkgZGVmaW5lZCBmb3Ig ZmFzdGNhbGwsIGJlbG93LgogI2lmIENBTExJTkdfQ09OVkVOVElPTl9JU19TVERDQUxMICYmICFP UyhXSU5ET1dTKQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgcmV0dXJuVHlwZT4KLSAgICBGdW5j dGlvblB0cihyZXR1cm5UeXBlIChDREVDTCAqdmFsdWUpKCkpCi0gICAgICAgIDogbV92YWx1ZSgo dm9pZCopdmFsdWUpCi0gICAgewotICAgICAgICBQb2lzb25lZE1hc21QdHI6OmFzc2VydElzTm90 UG9pc29uZWQobV92YWx1ZSk7Ci0gICAgICAgIEFTU0VSVF9WQUxJRF9DT0RFX1BPSU5URVIobV92 YWx1ZSk7Ci0gICAgfQotCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgcmV0dXJuVHlwZSwgdHlwZW5h bWUgYXJnVHlwZTE+Ci0gICAgRnVuY3Rpb25QdHIocmV0dXJuVHlwZSAoQ0RFQ0wgKnZhbHVlKShh cmdUeXBlMSkpCi0gICAgICAgIDogbV92YWx1ZSgodm9pZCopdmFsdWUpCi0gICAgewotICAgICAg ICBQb2lzb25lZE1hc21QdHI6OmFzc2VydElzTm90UG9pc29uZWQobV92YWx1ZSk7Ci0gICAgICAg IEFTU0VSVF9WQUxJRF9DT0RFX1BPSU5URVIobV92YWx1ZSk7Ci0gICAgfQotCi0gICAgdGVtcGxh dGU8dHlwZW5hbWUgcmV0dXJuVHlwZSwgdHlwZW5hbWUgYXJnVHlwZTEsIHR5cGVuYW1lIGFyZ1R5 cGUyPgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUgKENERUNMICp2YWx1ZSkoYXJnVHlwZTEs IGFyZ1R5cGUyKSkKLSAgICAgICAgOiBtX3ZhbHVlKCh2b2lkKil2YWx1ZSkKLSAgICB7Ci0gICAg ICAgIFBvaXNvbmVkTWFzbVB0cjo6YXNzZXJ0SXNOb3RQb2lzb25lZChtX3ZhbHVlKTsKLSAgICAg ICAgQVNTRVJUX1ZBTElEX0NPREVfUE9JTlRFUihtX3ZhbHVlKTsKLSAgICB9Ci0KLSAgICB0ZW1w bGF0ZTx0eXBlbmFtZSByZXR1cm5UeXBlLCB0eXBlbmFtZSBhcmdUeXBlMSwgdHlwZW5hbWUgYXJn VHlwZTIsIHR5cGVuYW1lIGFyZ1R5cGUzPgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUgKENE RUNMICp2YWx1ZSkoYXJnVHlwZTEsIGFyZ1R5cGUyLCBhcmdUeXBlMykpCi0gICAgICAgIDogbV92 YWx1ZSgodm9pZCopdmFsdWUpCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgcmV0dXJuVHlwZSwgdHlw ZW5hbWUuLi4gQXJndW1lbnRzPgorICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUoQ0RFQ0wgKnZh bHVlKShBcmd1bWVudHMuLi4pKQorICAgICAgICA6IG1fdmFsdWUocmVpbnRlcnByZXRfY2FzdDx2 b2lkKj4odmFsdWUpKQogICAgIHsKICAgICAgICAgUG9pc29uZWRNYXNtUHRyOjphc3NlcnRJc05v dFBvaXNvbmVkKG1fdmFsdWUpOwogICAgICAgICBBU1NFUlRfVkFMSURfQ09ERV9QT0lOVEVSKG1f dmFsdWUpOwogICAgIH0KIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIHJldHVyblR5cGUsIHR5cGVu YW1lIGFyZ1R5cGUxLCB0eXBlbmFtZSBhcmdUeXBlMiwgdHlwZW5hbWUgYXJnVHlwZTMsIHR5cGVu YW1lIGFyZ1R5cGU0PgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUgKENERUNMICp2YWx1ZSko YXJnVHlwZTEsIGFyZ1R5cGUyLCBhcmdUeXBlMywgYXJnVHlwZTQpKQotICAgICAgICA6IG1fdmFs dWUoKHZvaWQqKXZhbHVlKQotICAgIHsKLSAgICAgICAgUG9pc29uZWRNYXNtUHRyOjphc3NlcnRJ c05vdFBvaXNvbmVkKG1fdmFsdWUpOwotICAgICAgICBBU1NFUlRfVkFMSURfQ09ERV9QT0lOVEVS KG1fdmFsdWUpOwotICAgIH0KLSNlbmRpZgorI2VuZGlmIC8vIENBTExJTkdfQ09OVkVOVElPTl9J U19TVERDQUxMICYmICFPUyhXSU5ET1dTKQogCiAjaWYgQ09NUElMRVJfU1VQUE9SVFMoRkFTVENB TExfQ0FMTElOR19DT05WRU5USU9OKQogCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgcmV0dXJuVHlw ZT4KLSAgICBGdW5jdGlvblB0cihyZXR1cm5UeXBlIChGQVNUQ0FMTCAqdmFsdWUpKCkpCi0gICAg ICAgIDogbV92YWx1ZSgodm9pZCopdmFsdWUpCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgcmV0dXJu VHlwZSwgdHlwZW5hbWUuLi4gQXJndW1lbnRzPgorICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUo RkFTVENBTEwgKnZhbHVlKShBcmd1bWVudHMuLi4pKQorICAgICAgICA6IG1fdmFsdWUocmVpbnRl cnByZXRfY2FzdDx2b2lkKj4odmFsdWUpKQogICAgIHsKICAgICAgICAgUG9pc29uZWRNYXNtUHRy Ojphc3NlcnRJc05vdFBvaXNvbmVkKG1fdmFsdWUpOwogICAgICAgICBBU1NFUlRfVkFMSURfQ09E RV9QT0lOVEVSKG1fdmFsdWUpOwogICAgIH0KIAotICAgIHRlbXBsYXRlPHR5cGVuYW1lIHJldHVy blR5cGUsIHR5cGVuYW1lIGFyZ1R5cGUxPgotICAgIEZ1bmN0aW9uUHRyKHJldHVyblR5cGUgKEZB U1RDQUxMICp2YWx1ZSkoYXJnVHlwZTEpKQotICAgICAgICA6IG1fdmFsdWUoKHZvaWQqKXZhbHVl KQotICAgIHsKLSAgICAgICAgUG9pc29uZWRNYXNtUHRyOjphc3NlcnRJc05vdFBvaXNvbmVkKG1f dmFsdWUpOwotICAgICAgICBBU1NFUlRfVkFMSURfQ09ERV9QT0lOVEVSKG1fdmFsdWUpOwotICAg IH0KLQotICAgIHRlbXBsYXRlPHR5cGVuYW1lIHJldHVyblR5cGUsIHR5cGVuYW1lIGFyZ1R5cGUx LCB0eXBlbmFtZSBhcmdUeXBlMj4KLSAgICBGdW5jdGlvblB0cihyZXR1cm5UeXBlIChGQVNUQ0FM TCAqdmFsdWUpKGFyZ1R5cGUxLCBhcmdUeXBlMikpCi0gICAgICAgIDogbV92YWx1ZSgodm9pZCop dmFsdWUpCi0gICAgewotICAgICAgICBQb2lzb25lZE1hc21QdHI6OmFzc2VydElzTm90UG9pc29u ZWQobV92YWx1ZSk7Ci0gICAgICAgIEFTU0VSVF9WQUxJRF9DT0RFX1BPSU5URVIobV92YWx1ZSk7 Ci0gICAgfQotCi0gICAgdGVtcGxhdGU8dHlwZW5hbWUgcmV0dXJuVHlwZSwgdHlwZW5hbWUgYXJn VHlwZTEsIHR5cGVuYW1lIGFyZ1R5cGUyLCB0eXBlbmFtZSBhcmdUeXBlMz4KLSAgICBGdW5jdGlv blB0cihyZXR1cm5UeXBlIChGQVNUQ0FMTCAqdmFsdWUpKGFyZ1R5cGUxLCBhcmdUeXBlMiwgYXJn VHlwZTMpKQotICAgICAgICA6IG1fdmFsdWUoKHZvaWQqKXZhbHVlKQotICAgIHsKLSAgICAgICAg UG9pc29uZWRNYXNtUHRyOjphc3NlcnRJc05vdFBvaXNvbmVkKG1fdmFsdWUpOwotICAgICAgICBB U1NFUlRfVkFMSURfQ09ERV9QT0lOVEVSKG1fdmFsdWUpOwotICAgIH0KLQotICAgIHRlbXBsYXRl PHR5cGVuYW1lIHJldHVyblR5cGUsIHR5cGVuYW1lIGFyZ1R5cGUxLCB0eXBlbmFtZSBhcmdUeXBl MiwgdHlwZW5hbWUgYXJnVHlwZTMsIHR5cGVuYW1lIGFyZ1R5cGU0PgotICAgIEZ1bmN0aW9uUHRy KHJldHVyblR5cGUgKEZBU1RDQUxMICp2YWx1ZSkoYXJnVHlwZTEsIGFyZ1R5cGUyLCBhcmdUeXBl MywgYXJnVHlwZTQpKQotICAgICAgICA6IG1fdmFsdWUoKHZvaWQqKXZhbHVlKQotICAgIHsKLSAg ICAgICAgUG9pc29uZWRNYXNtUHRyOjphc3NlcnRJc05vdFBvaXNvbmVkKG1fdmFsdWUpOwotICAg ICAgICBBU1NFUlRfVkFMSURfQ09ERV9QT0lOVEVSKG1fdmFsdWUpOwotICAgIH0KLSNlbmRpZgor I2VuZGlmIC8vIENPTVBJTEVSX1NVUFBPUlRTKEZBU1RDQUxMX0NBTExJTkdfQ09OVkVOVElPTikK IAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIEZ1bmN0aW9uVHlwZT4KICAgICBleHBsaWNpdCBGdW5j dGlvblB0cihGdW5jdGlvblR5cGUqIHZhbHVlKQo=