195698 2019-03-13 14:03:44 -0700 Remove unneeded --tradeDestructorBlocks option. 2019-03-13 15:06:09 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam ews-watchlist keith_miller msaboff saam webkit-bug-importer ysuzuki oldest_to_newest 1516150 0 mark.lam 2019-03-13 14:03:44 -0700 There's no reason why we would ever want --tradeDestructorBlocs to be false. <rdar://problem/39681388> 1516160 1 364572 mark.lam 2019-03-13 14:28:20 -0700 Created attachment 364572 proposed patch. 1516176 2 364572 ysuzuki 2019-03-13 14:47:15 -0700 Comment on attachment 364572 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=364572&action=review r=me > Source/JavaScriptCore/ChangeLog:16 > + (!Options::tradeDestructorBlocks() && needsDestruction()). This assertion is > + outdated because the BlockDirectory's m_empty set used to mean the set of all > + blocks that have no live (as in not reachable by GC) objects and dead objects > + also do not require destructors to be called on them. The current meaning of > + m_empty is that it is the set of all blocks that have no live objects, OK, now, it is separated as "m_destructible". > Source/JavaScriptCore/heap/LocalAllocator.cpp:190 > OK, it is always calling `block->sweep(nullptr)`. So we can get blocks even if m_directory is destructible (trade-destructor-blocks). 1516187 3 mark.lam 2019-03-13 15:06:09 -0700 Thanks for the review. Landed in r242912: <http://trac.webkit.org/r242912>. 364572 2019-03-13 14:28:20 -0700 2019-03-13 14:47:15 -0700 proposed patch. bug-195698.patch text/plain 5127 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQyOTA2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBA CisyMDE5LTAzLTEzICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW1vdmUgdW5uZWVkZWQgLS10cmFkZURlc3RydWN0b3JCbG9ja3Mgb3B0aW9uLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1Njk4CisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8zOTY4MTM4OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGVyZSdzIG5vIHJlYXNvbiB3aHkgd2Ugd291bGQgZXZlciB3YW50 IC0tdHJhZGVEZXN0cnVjdG9yQmxvY2tzIHRvIGJlIGZhbHNlLgorCisgICAgICAgIEFsc28sIHRo ZXJlIHdhcyBhbiBhc3NlcnRpb24gaW4gQmxvY2tEaXJlY3Rvcnk6OmVuZE1hcmtpbmcoKSBmb3Ig d2hlbgorICAgICAgICAoIU9wdGlvbnM6OnRyYWRlRGVzdHJ1Y3RvckJsb2NrcygpICYmIG5lZWRz RGVzdHJ1Y3Rpb24oKSkuICBUaGlzIGFzc2VydGlvbiBpcworICAgICAgICBvdXRkYXRlZCBiZWNh dXNlIHRoZSBCbG9ja0RpcmVjdG9yeSdzIG1fZW1wdHkgc2V0IHVzZWQgdG8gbWVhbiB0aGUgc2V0 IG9mIGFsbAorICAgICAgICBibG9ja3MgdGhhdCBoYXZlIG5vIGxpdmUgKGFzIGluIG5vdCByZWFj aGFibGUgYnkgR0MpIG9iamVjdHMgYW5kIGRlYWQgb2JqZWN0cworICAgICAgICBhbHNvIGRvIG5v dCByZXF1aXJlIGRlc3RydWN0b3JzIHRvIGJlIGNhbGxlZCBvbiB0aGVtLiAgVGhlIGN1cnJlbnQg bWVhbmluZyBvZgorICAgICAgICBtX2VtcHR5IGlzIHRoYXQgaXQgaXMgdGhlIHNldCBvZiBhbGwg YmxvY2tzIHRoYXQgaGF2ZSBubyBsaXZlIG9iamVjdHMsCisgICAgICAgIGluZGVwZW5kZW50IG9m IHdoZXRoZXIgdGhleSBuZWVkcyBkZXN0cnVjdG9ycyB0byBiZSBjYWxsZWQgb24gdGhlbSBvciBu b3QuCisgICAgICAgIFRoZSBhc3NlcnRpb24gaXMgbm8gbG9uZ2VyIHZhbGlkIGZvciB0aGUgbmV3 IG1lYW5pbmcgb2YgbV9lbXB0eSBhcyBtX2VtcHR5IG1heQorICAgICAgICBub3cgY29udGFpbiBk ZXN0cnVjdGlibGUgYmxvY2tzLiAgVGhpcyBhc3NlcnRpb24gaXMgbm93IHJlbW92ZWQgYXMgcGFy dCBvZiB0aGlzCisgICAgICAgIHBhdGNoLgorCisgICAgICAgICogaGVhcC9CbG9ja0RpcmVjdG9y eS5jcHA6CisgICAgICAgIChKU0M6OkJsb2NrRGlyZWN0b3J5OjplbmRNYXJraW5nKToKKyAgICAg ICAgKiBoZWFwL0xvY2FsQWxsb2NhdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6TG9jYWxBbGxvY2F0 b3I6OnRyeUFsbG9jYXRlV2l0aG91dENvbGxlY3RpbmcpOgorICAgICAgICAqIHJ1bnRpbWUvT3B0 aW9ucy5oOgorCiAyMDE5LTAzLTExICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+ CiAKICAgICAgICAgW0pTQ10gTW92ZSBzcGVjaWVzIHdhdGNocG9pbnQgaW5zdGFsbGF0aW9uIGZy b20gQXJyYXlQcm90b3R5cGUgdG8gSlNHbG9iYWxPYmplY3QKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9oZWFwL0Jsb2NrRGlyZWN0b3J5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaGVhcC9CbG9ja0RpcmVjdG9yeS5jcHAJKHJldmlzaW9uIDI0MjkwNSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0Jsb2NrRGlyZWN0b3J5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTItMjAxOCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMTItMjAxOSBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTI0OSwxNCArMjQ5LDkgQEAgdm9pZCBCbG9ja0RpcmVjdG9yeTo6ZW5kTWFya2lu ZygpCiAgICAgLy8ga25vdyB3aGF0IGtpbmQgb2YgY29sbGVjdGlvbiBpdCBpcy4gVGhhdCBrbm93 bGVkZ2UgaXMgYWxyZWFkeSBlbmNvZGVkIGluIHRoZSBtX21hcmtpbmdYWVoKICAgICAvLyB2ZWN0 b3JzLgogICAgIAotICAgIGlmICghT3B0aW9uczo6dHJhZGVEZXN0cnVjdG9yQmxvY2tzKCkgJiYg bmVlZHNEZXN0cnVjdGlvbigpKSB7Ci0gICAgICAgIEFTU0VSVChtX2VtcHR5LmlzRW1wdHkoKSk7 Ci0gICAgICAgIG1fY2FuQWxsb2NhdGVCdXROb3RFbXB0eSA9IG1fbGl2ZSAmIH5tX21hcmtpbmdS ZXRpcmVkOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fZW1wdHkgPSBtX2xpdmUgJiB+bV9tYXJr aW5nTm90RW1wdHk7Ci0gICAgICAgIG1fY2FuQWxsb2NhdGVCdXROb3RFbXB0eSA9IG1fbGl2ZSAm IG1fbWFya2luZ05vdEVtcHR5ICYgfm1fbWFya2luZ1JldGlyZWQ7Ci0gICAgfQotICAgIAorICAg IG1fZW1wdHkgPSBtX2xpdmUgJiB+bV9tYXJraW5nTm90RW1wdHk7CisgICAgbV9jYW5BbGxvY2F0 ZUJ1dE5vdEVtcHR5ID0gbV9saXZlICYgbV9tYXJraW5nTm90RW1wdHkgJiB+bV9tYXJraW5nUmV0 aXJlZDsKKwogICAgIGlmIChuZWVkc0Rlc3RydWN0aW9uKCkpIHsKICAgICAgICAgLy8gVGhlcmUg YXJlIHNvbWUgYmxvY2tzIHRoYXQgd2UgZGlkbid0IGFsbG9jYXRlIG91dCBvZiBpbiB0aGUgbGFz dCBjeWNsZSwgYnV0IHdlIHN3ZXB0IHRoZW0uIFRoaXMKICAgICAgICAgLy8gd2lsbCBmb3JnZXQg dGhhdCB3ZSBkaWQgdGhhdCBhbmQgd2Ugd2lsbCBlbmQgdXAgc3dlZXBpbmcgdGhlbSBhZ2FpbiBh bmQgYXR0ZW1wdGluZyB0byBjYWxsIHRoZWlyCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aGVhcC9Mb2NhbEFsbG9jYXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL2hlYXAvTG9jYWxBbGxvY2F0b3IuY3BwCShyZXZpc2lvbiAyNDI5MDUpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvaGVhcC9Mb2NhbEFsbG9jYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDE4IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxOC0yMDE5IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTg0 LDggKzE4NCw3IEBAIHZvaWQqIExvY2FsQWxsb2NhdG9yOjp0cnlBbGxvY2F0ZVdpdGhvdXQKICAg ICAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQogICAgIAotICAgIGlmIChPcHRpb25zOjpz dGVhbEVtcHR5QmxvY2tzRnJvbU90aGVyQWxsb2NhdG9ycygpCi0gICAgICAgICYmIChPcHRpb25z Ojp0cmFkZURlc3RydWN0b3JCbG9ja3MoKSB8fCAhbV9kaXJlY3RvcnktPm5lZWRzRGVzdHJ1Y3Rp b24oKSkpIHsKKyAgICBpZiAoT3B0aW9uczo6c3RlYWxFbXB0eUJsb2Nrc0Zyb21PdGhlckFsbG9j YXRvcnMoKSkgewogICAgICAgICBpZiAoTWFya2VkQmxvY2s6OkhhbmRsZSogYmxvY2sgPSBtX2Rp cmVjdG9yeS0+bV9zdWJzcGFjZS0+ZmluZEVtcHR5QmxvY2tUb1N0ZWFsKCkpIHsKICAgICAgICAg ICAgIFJFTEVBU0VfQVNTRVJUKGJsb2NrLT5hbGlnbmVkTWVtb3J5QWxsb2NhdG9yKCkgPT0gbV9k aXJlY3RvcnktPm1fc3Vic3BhY2UtPmFsaWduZWRNZW1vcnlBbGxvY2F0b3IoKSk7CiAgICAgICAg ICAgICAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zLmgJKHJldmlz aW9uIDI0MjkwNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL09wdGlvbnMuaAko d29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEt MjAxOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIw MTEtMjAxOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKQEAgLTI1Miw3ICsyNTIsNiBAQCBjb25zdGV4cHIgYm9vbCBlbmFibGVX ZWJBc3NlbWJseVN0cmVhbWluCiAgICAgdihib29sLCBkdW1wU2l6ZUNsYXNzZXMsIGZhbHNlLCBO b3JtYWwsIG51bGxwdHIpIFwKICAgICB2KGJvb2wsIHVzZUJ1bXBBbGxvY2F0b3IsIHRydWUsIE5v cm1hbCwgbnVsbHB0cikgXAogICAgIHYoYm9vbCwgc3RlYWxFbXB0eUJsb2Nrc0Zyb21PdGhlckFs bG9jYXRvcnMsIHRydWUsIE5vcm1hbCwgbnVsbHB0cikgXAotICAgIHYoYm9vbCwgdHJhZGVEZXN0 cnVjdG9yQmxvY2tzLCB0cnVlLCBOb3JtYWwsIG51bGxwdHIpIFwKICAgICB2KGJvb2wsIGVhZ2Vy bHlVcGRhdGVUb3BDYWxsRnJhbWUsIGZhbHNlLCBOb3JtYWwsIG51bGxwdHIpIFwKICAgICBcCiAg ICAgdihib29sLCB1c2VPU1JFbnRyeVRvREZHLCB0cnVlLCBOb3JtYWwsIG51bGxwdHIpIFwK