194399 2019-02-07 10:33:55 -0800 Fix more doesGC() for CheckTraps, GetMapBucket, and Switch nodes. 2019-02-12 13:17:51 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam fpizlo keith_miller mcatanzaro msaboff rmorisset saam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1503788 0 mark.lam 2019-02-07 10:33:55 -0800 CheckTraps, GetMapBucket, and Switch nodes can GC. 1503823 1 webkit-bug-importer 2019-02-07 11:02:26 -0800 <rdar://problem/47889777> 1503829 2 361420 mark.lam 2019-02-07 11:09:15 -0800 Created attachment 361420 proposed patch. 1503830 3 361420 ysuzuki 2019-02-07 11:11:07 -0800 Comment on attachment 361420 proposed patch. r=me 1503871 4 mark.lam 2019-02-07 12:20:52 -0800 Thanks for the review. Landed in r241140: <http://trac.webkit.org/r241140>. 1505359 5 mcatanzaro 2019-02-12 13:17:30 -0800 Note GCC doesn't like this: [1181/3497] Building CXX object Source...sources/UnifiedSource-bfc896e1-6.cpp.o In file included from DerivedSources/JavaScriptCore/unified-sources/UnifiedSource-bfc896e1-6.cpp:3: ../../Source/JavaScriptCore/dfg/DFGDoesGC.cpp: In function ‘bool JSC::DFG::doesGC(JSC::DFG::Graph&, JSC::DFG::Node*)’: ../../Source/JavaScriptCore/dfg/DFGDoesGC.cpp:464:9: warning: this statement may fall through [-Wimplicit-fallthrough=] switch (node->switchData()->kind) { ^~~~~~ ../../Source/JavaScriptCore/dfg/DFGDoesGC.cpp:479:5: note: here case LastNodeType: ^~~~ I'll also remove the two unreachable returns while I'm fixing this. 1505361 6 mcatanzaro 2019-02-12 13:17:51 -0800 Committed r241314: <https://trac.webkit.org/changeset/241314> 361420 2019-02-07 11:09:15 -0800 2019-02-07 11:11:07 -0800 proposed patch. bug-194399.patch text/plain 7082 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQxMDM5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ0IEBA CisyMDE5LTAyLTA1ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggbW9yZSBkb2VzR0MoKSBmb3IgQ2hlY2tUcmFwcywgR2V0TWFwQnVja2V0LCBhbmQgU3dpdGNo IG5vZGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk0Mzk5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80Nzg4OTc3Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZG9lc0dDKCkgZm9yIHRoZSBm b2xsb3dpbmcgbm9kZXM6CisKKyAgICAgICAgICAgIENoZWNrVHJhcHM6CisgICAgICAgICAgICAg ICAgV2Ugbm9ybWFsbHkgd2lsbCBub3QgZW1pdCB0aGlzIG5vZGUgYmVjYXVzZSBPcHRpb25zOjp1 c2VQb2xsaW5nVHJhcHMoKSBpcworICAgICAgICAgICAgICAgIGZhbHNlIGJ5IGRlZmF1bHQuICBI b3dldmVyLCBhcyBpdCBpcyBpbXBsZW1lbnRlZCBub3csIENoZWNrVHJhcHMgY2FuIEdDCisgICAg ICAgICAgICAgICAgYmVjYXVzZSBpdCBjYW4gYWxsb2NhdGUgYSBUZXJtaW5hdGVkRXhlY3V0aW9u RXhjZXB0aW9uLiAgSWYgd2UgbWFrZSB0aGUKKyAgICAgICAgICAgICAgICBUZXJtaW5hdGVkRXhl Y3V0aW9uRXhjZXB0aW9uIGEgc2luZ2xldG9uIGFsbG9jYXRlZCBhdCBpbml0aWFsaXphdGlvbiB0 aW1lLAorICAgICAgICAgICAgICAgIGRvZXNHQygpIGNhbiByZXR1cm4gZmFsc2UgZm9yIENoZWNr VHJhcHMuCisgICAgICAgICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5NDMyMworCisgICAgICAgICAgICBHZXRNYXBCdWNrZXQ6CisgICAgICAgICAgICAg ICAgQ2FuIGNhbGwgb3BlcmF0aW9uSlNNYXBGaW5kQnVja2V0KCkgb3Igb3BlcmF0aW9uSlNTZXRG aW5kQnVja2V0KCksCisgICAgICAgICAgICAgICAgd2hpY2ggY2FsbHMgSGFzaE1hcEltcGw6OmZp bmRCdWNrZXQoKSwgd2hpY2ggY2FsbHMganNNYXBIYXNoKCksIHdoaWNoCisgICAgICAgICAgICAg ICAgY2FuIHJlc29sdmUgYSByb3BlLgorCisgICAgICAgICAgICBTd2l0Y2g6CisgICAgICAgICAg ICAgICAgSWYgc3dpdGNoRGF0YSBraW5kIGlzIFN3aXRjaENoYXIsIGNhbiBjYWxsIG9wZXJhdGlv blJlc29sdmVSb3BlKCkgLgorICAgICAgICAgICAgICAgIElmIHN3aXRjaERhdGEga2luZCBpcyBT d2l0Y2hTdHJpbmcgYW5kIHRoZSBjaGlsZCB1c2Uga2luZCBpcyBub3QgU3RyaW5nSWRlbnRVc2Us CisgICAgICAgICAgICAgICAgICAgIGNhbiBjYWxsIG9wZXJhdGlvblN3aXRjaFN0cmluZygpIHdo aWNoIHJlc29sdmVzIHJvcGVzLgorCisgICAgICAgICAgICBEaXJlY3RUYWlsQ2FsbDoKKyAgICAg ICAgICAgIEZvcmNlT1NSRXhpdDoKKyAgICAgICAgICAgIFJldHVybjoKKyAgICAgICAgICAgIFRh aWxDYWxsRm9yd2FyZFZhcmFyZ3M6CisgICAgICAgICAgICBUYWlsQ2FsbFZhcmFyZ3M6CisgICAg ICAgICAgICBUaHJvdzoKKyAgICAgICAgICAgICAgICBUaGVzZSBhcmUgdGVybWluYWwgbm9kZXMu ICBJdCBzaG91bGRuJ3QgcmVhbGx5IG1hdHRlciB3aGF0IGRvZXNHQygpIHJldHVybnMKKyAgICAg ICAgICAgICAgICBmb3IgdGhlbSwgYnV0IGZvbGxvd2luZyBvdXIgY29uc2VydmF0aXZlIHByYWN0 aWNlLCB1bmxlc3Mgd2UgaGF2ZSBhIGdvb2QKKyAgICAgICAgICAgICAgICByZWFzb24gZm9yIGRv ZXNHQygpIHRvIHJldHVybiBmYWxzZSwgd2Ugc2hvdWxkIGp1c3QgcmV0dXJuIHRydWUuCisKKyAg ICAgICAgKiBkZmcvREZHRG9lc0dDLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpkb2VzR0MpOgor CiAyMDE5LTAyLTA2ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAg ICAgW0pTQ10gVW5pZnkgaW5kaXJlY3RFdmFsRXhlY3V0YWJsZVNwYWNlIGFuZCBkaXJlY3RFdmFs RXhlY3V0YWJsZVNwYWNlCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0RvZXNH Qy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdEb2VzR0Mu Y3BwCShyZXZpc2lvbiAyNDEwMzkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Rv ZXNHQy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDggKzQxLDE5IEBAIGJvb2wgZG9lc0dDKEdy YXBoJiBncmFwaCwgTm9kZSogbm9kZSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgCiAgICAg Ly8gTm93IGNvbnNpZGVyIG5vZGVzIHRoYXQgZG9uJ3QgY2xvYmJlciB0aGUgd29ybGQgYnV0IHRo YXQgc3RpbGwgbWF5IEdDLiBUaGlzIGluY2x1ZGVzIGFsbAotICAgIC8vIG5vZGVzLiBCeSBjb252 ZW50aW9uIHdlIHB1dCB3b3JsZC1jbG9iYmVyaW5nIG5vZGVzIGluIHRoZSBibG9jayBvZiAiZmFs c2UiIGNhc2VzIGJ1dCB3ZSBjYW4KLSAgICAvLyBwdXQgdGhlbSBhbnl3aGVyZS4KKyAgICAvLyBu b2Rlcy4gQnkgZGVmYXVsdCwgd2Ugc2hvdWxkIGFzc3VtZSBldmVyeSBub2RlIGNhbiBHQyBhbmQg cmV0dXJuIHRydWUuIFRoaXMgaW5jbHVkZXMgdGhlCisgICAgLy8gd29ybGQtY2xvYmJlcmluZyBu b2Rlcy4gV2Ugc2hvdWxkIG9ubHkgcmV0dXJuIGZhbHNlIGlmIHdlIGhhdmUgcHJvdmVuIHRoYXQg dGhlIG5vZGUgY2Fubm90CisgICAgLy8gR0MuIFR5cGljYWwgZXhhbXBsZXMgb2YgaG93IGEgbm9k ZSBjYW4gR0MgaXMgaWYgdGhlIGNvZGUgZW1pdHRlZCBmb3IgdGhlIG5vZGUgZG9lcyBhbnkgb2Yg dGhlCisgICAgLy8gZm9sbG93aW5nOgorICAgIC8vICAgICAxLiBBbGxvY2F0ZXMgYW55IG9iamVj dHMuCisgICAgLy8gICAgIDIuIFJlc29sdmVzIGEgcm9wZSBzdHJpbmcsIHdoaWNoIGFsbG9jYXRl cyBhIHN0cmluZy4KKyAgICAvLyAgICAgMy4gUHJvZHVjZXMgYSBzdHJpbmcgKHdoaWNoIGFsbG9j YXRlcyB0aGUgc3RyaW5nKSBleGNlcHQgd2hlbiB3ZSBjYW4gcHJvdmUgdGhhdAorICAgIC8vICAg ICAgICB0aGUgc3RyaW5nIHdpbGwgYWx3YXlzIGJlIG9uZSBvZiB0aGUgcHJlLWFsbGNvYXRlZCBT bWFsbFN0cmluZ3MuCisgICAgLy8gICAgIDQuIFRyaWdnZXJzIGEgc3RydWN0dXJlIHRyYW5zaXRp b24gKHdoaWNoIGNhbiBhbGxvY2F0ZSBhIG5ldyBzdHJ1Y3R1cmUpCisgICAgLy8gICAgICAgIHVu bGVzcyBpdCBpcyBhIGtub3duIHRyYW5zaXRpb24gYmV0d2VlbiBwcmV2aW91c2x5IGFsbG9jYXRl ZCBzdHJ1Y3R1cmVzCisgICAgLy8gICAgICAgIHN1Y2ggYXMgYmV0d2VlbiBBcnJheSB0eXBlcy4K KyAgICAvLyAgICAgNS4gQ2FsbHMgdG8gYSBKUyBmdW5jdGlvbiwgd2hpY2ggY2FuIGV4ZWN1dGUg YXJiaXRyYXJ5IGNvZGUgaW5jbHVkaW5nIGFsbG9jYXRpbmcgb2JqZWN0cy4KKwogICAgIHN3aXRj aCAobm9kZS0+b3AoKSkgewogICAgIGNhc2UgSlNDb25zdGFudDoKICAgICBjYXNlIERvdWJsZUNv bnN0YW50OgpAQCAtMTMwLDcgKzE0MSw2IEBAIGJvb2wgZG9lc0dDKEdyYXBoJiBncmFwaCwgTm9k ZSogbm9kZSkKICAgICBjYXNlIENvbXBhcmVFcToKICAgICBjYXNlIENvbXBhcmVTdHJpY3RFcToK ICAgICBjYXNlIENvbXBhcmVFcVB0cjoKLSAgICBjYXNlIFRhaWxDYWxsRm9yd2FyZFZhcmFyZ3M6 CiAgICAgY2FzZSBQcm9maWxlVHlwZToKICAgICBjYXNlIFByb2ZpbGVDb250cm9sRmxvdzoKICAg ICBjYXNlIE92ZXJyaWRlc0hhc0luc3RhbmNlOgpAQCAtMTQ5LDIwICsxNTksMTIgQEAgYm9vbCBk b2VzR0MoR3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlKQogICAgIGNhc2UgTG9naWNhbE5vdDoKICAg ICBjYXNlIEp1bXA6CiAgICAgY2FzZSBCcmFuY2g6Ci0gICAgY2FzZSBTd2l0Y2g6CiAgICAgY2Fz ZSBFbnRyeVN3aXRjaDoKLSAgICBjYXNlIFJldHVybjoKLSAgICBjYXNlIERpcmVjdFRhaWxDYWxs OgotICAgIGNhc2UgVGFpbENhbGxWYXJhcmdzOgotICAgIGNhc2UgVGhyb3c6CiAgICAgY2FzZSBD b3VudEV4ZWN1dGlvbjoKICAgICBjYXNlIFN1cGVyU2FtcGxlckJlZ2luOgogICAgIGNhc2UgU3Vw ZXJTYW1wbGVyRW5kOgotICAgIGNhc2UgRm9yY2VPU1JFeGl0OgogICAgIGNhc2UgQ1BVSW50cmlu c2ljOgotICAgIGNhc2UgQ2hlY2tUcmFwczoKICAgICBjYXNlIE5vcm1hbGl6ZU1hcEtleToKLSAg ICBjYXNlIEdldE1hcEJ1Y2tldDoKICAgICBjYXNlIEdldE1hcEJ1Y2tldEhlYWQ6CiAgICAgY2Fz ZSBHZXRNYXBCdWNrZXROZXh0OgogICAgIGNhc2UgTG9hZEtleUZyb21NYXBCdWNrZXQ6CkBAIC0y NTcsNiArMjU5LDcgQEAgYm9vbCBkb2VzR0MoR3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlKQogICAg IGNhc2UgRGF0YVZpZXdTZXQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorI2lmICFBU1NFUlRf RElTQUJMRUQKICAgICBjYXNlIEFycmF5UHVzaDoKICAgICBjYXNlIEFycmF5UG9wOgogICAgIGNh c2UgUHVzaFdpdGhTY29wZToKQEAgLTI3OCw3ICsyODEsOSBAQCBib29sIGRvZXNHQyhHcmFwaCYg Z3JhcGgsIE5vZGUqIG5vZGUpCiAgICAgY2FzZSBEZWxldGVCeVZhbDoKICAgICBjYXNlIERpcmVj dENhbGw6CiAgICAgY2FzZSBEaXJlY3RDb25zdHJ1Y3Q6CisgICAgY2FzZSBEaXJlY3RUYWlsQ2Fs bDoKICAgICBjYXNlIERpcmVjdFRhaWxDYWxsSW5saW5lZENhbGxlcjoKKyAgICBjYXNlIEZvcmNl T1NSRXhpdDoKICAgICBjYXNlIEdldEJ5SWQ6CiAgICAgY2FzZSBHZXRCeUlkRGlyZWN0OgogICAg IGNhc2UgR2V0QnlJZERpcmVjdEZsdXNoOgpAQCAtMjg3LDYgKzI5Miw3IEBAIGJvb2wgZG9lc0dD KEdyYXBoJiBncmFwaCwgTm9kZSogbm9kZSkKICAgICBjYXNlIEdldEJ5VmFsV2l0aFRoaXM6CiAg ICAgY2FzZSBHZXREaXJlY3RQbmFtZToKICAgICBjYXNlIEdldER5bmFtaWNWYXI6CisgICAgY2Fz ZSBHZXRNYXBCdWNrZXQ6CiAgICAgY2FzZSBIYXNHZW5lcmljUHJvcGVydHk6CiAgICAgY2FzZSBI YXNPd25Qcm9wZXJ0eToKICAgICBjYXNlIEhhc1N0cnVjdHVyZVByb3BlcnR5OgpAQCAtMzE4LDEw ICszMjQsMTQgQEAgYm9vbCBkb2VzR0MoR3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlKQogICAgIGNh c2UgUmVnRXhwVGVzdDoKICAgICBjYXNlIFJlc29sdmVTY29wZToKICAgICBjYXNlIFJlc29sdmVT Y29wZUZvckhvaXN0aW5nRnVuY0RlY2xJbkV2YWw6CisgICAgY2FzZSBSZXR1cm46CiAgICAgY2Fz ZSBUYWlsQ2FsbDoKKyAgICBjYXNlIFRhaWxDYWxsRm9yd2FyZFZhcmFyZ3M6CiAgICAgY2FzZSBU YWlsQ2FsbEZvcndhcmRWYXJhcmdzSW5saW5lZENhbGxlcjoKICAgICBjYXNlIFRhaWxDYWxsSW5s aW5lZENhbGxlcjoKKyAgICBjYXNlIFRhaWxDYWxsVmFyYXJnczoKICAgICBjYXNlIFRhaWxDYWxs VmFyYXJnc0lubGluZWRDYWxsZXI6CisgICAgY2FzZSBUaHJvdzoKICAgICBjYXNlIFRvTnVtYmVy OgogICAgIGNhc2UgVG9PYmplY3Q6CiAgICAgY2FzZSBUb1ByaW1pdGl2ZToKQEAgLTM3OCw2ICsz ODgsMTEgQEAgYm9vbCBkb2VzR0MoR3JhcGgmIGdyYXBoLCBOb2RlKiBub2RlKQogICAgIGNhc2Ug VmFsdWVNdWw6CiAgICAgY2FzZSBWYWx1ZURpdjoKICAgICBjYXNlIFZhbHVlTmVnYXRlOgorI2Vs c2UKKyAgICAvLyBTZWUgY29tbWVudCBhdCB0aGUgdG9wIGZvciB3aHkgYmUgZGVmYXVsdCBmb3Ig YWxsIG5vZGVzIHNob3VsZCBiZSB0bworICAgIC8vIHJldHVybiB0cnVlLgorICAgIGRlZmF1bHQ6 CisjZW5kaWYKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBjYXNlIENhbGxTdHJpbmdDb25z dHJ1Y3RvcjoKQEAgLTM5MSw2ICs0MDYsMTEgQEAgYm9vbCBkb2VzR0MoR3JhcGgmIGdyYXBoLCBO b2RlKiBub2RlKQogICAgICAgICB9CiAgICAgICAgIHJldHVybiB0cnVlOwogCisgICAgY2FzZSBD aGVja1RyYXBzOgorICAgICAgICAvLyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5NDMyMworICAgICAgICBBU1NFUlQoT3B0aW9uczo6dXNlUG9sbGluZ1Ry YXBzKCkpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKwogICAgIGNhc2UgR2V0SW5kZXhlZFByb3Bl cnR5U3RvcmFnZToKICAgICAgICAgaWYgKG5vZGUtPmFycmF5TW9kZSgpLnR5cGUoKSA9PSBBcnJh eTo6U3RyaW5nKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC00MjMsNiArNDQzLDIyIEBA IGJvb2wgZG9lc0dDKEdyYXBoJiBncmFwaCwgTm9kZSogbm9kZSkKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAKKyAgICBjYXNlIFN3aXRjaDoKKyAgICAg ICAgc3dpdGNoIChub2RlLT5zd2l0Y2hEYXRhKCktPmtpbmQpIHsKKyAgICAgICAgY2FzZSBTd2l0 Y2hDZWxsOgorICAgICAgICAgICAgQVNTRVJUKGdyYXBoLm1fcGxhbi5pc0ZUTCgpKTsKKyAgICAg ICAgICAgIEZBTExUSFJPVUdIOworICAgICAgICBjYXNlIFN3aXRjaEltbToKKyAgICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgY2FzZSBTd2l0Y2hDaGFyOgorICAgICAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgICAgIGNhc2UgU3dpdGNoU3RyaW5nOgorICAgICAgICAgICAgaWYgKG5v ZGUtPmNoaWxkMSgpLnVzZUtpbmQoKSA9PSBTdHJpbmdJZGVudFVzZSkKKyAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBBU1NFUlQobm9kZS0+Y2hpbGQxKCkudXNlS2lu ZCgpID09IFN0cmluZ1VzZSB8fCBub2RlLT5jaGlsZDEoKS51c2VLaW5kKCkgPT0gVW50eXBlZFVz ZSk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorCiAgICAgY2FzZSBMYXN0 Tm9kZVR5cGU6CiAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAg IHJldHVybiB0cnVlOwo=