146874 2015-07-10 22:46:39 -0700 Watchpoints should be allocated with FastMalloc 2015-07-11 15:30:57 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fpizlo fpizlo barraclough basile_clement benjamin ggaren mark.lam mhahnenb mmirman msaboff nrotem oliver saam sam oldest_to_newest 1108891 0 fpizlo 2015-07-10 22:46:39 -0700 Previously we had some cruft about allocating some kinds of Watchpoints in SegmentedVectors. That's pretty sad. Also, it appears that some of the watchpoints are allocated with normal malloc. Also sad. 1108893 1 256645 fpizlo 2015-07-10 22:49:21 -0700 Created attachment 256645 the patch 1108894 2 256645 fpizlo 2015-07-10 22:51:09 -0700 Comment on attachment 256645 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=256645&action=review > Source/JavaScriptCore/bytecode/CodeBlockJettisoningWatchpoint.h:2 > - * Copyright (C) 2013 Apple Inc. All rights reserved. > + * Copyright (C) 2013, 2015 Apple Inc. All rights reserved. Oops, I'll revert. I just deleted code. 1108896 3 fpizlo 2015-07-10 22:54:24 -0700 Landed in http://trac.webkit.org/changeset/186705 1108986 4 256645 darin 2015-07-11 15:30:19 -0700 Comment on attachment 256645 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=256645&action=review > Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.h:95 > typename HashSet<WatchpointSetType*>::iterator iter = m_sets.begin(); > typename HashSet<WatchpointSetType*>::iterator end = m_sets.end(); > - for (; iter != end; ++iter) { > - common.watchpoints.append(CodeBlockJettisoningWatchpoint(codeBlock)); > - Adaptor::add(codeBlock, *iter, &common.watchpoints.last()); > - } > + for (; iter != end; ++iter) > + Adaptor::add(codeBlock, *iter, common.watchpoints.add(codeBlock)); Here’s another way to write this: for (auto* set : m_sets) Adaptor::add(codeBlock, set, common.watchpoints.add(codeBlock)); I think the modern for loop makes this code look clearer. 1108987 5 256645 darin 2015-07-11 15:30:57 -0700 Comment on attachment 256645 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=256645&action=review >> Source/JavaScriptCore/dfg/DFGDesiredWatchpoints.h:95 >> + Adaptor::add(codeBlock, *iter, common.watchpoints.add(codeBlock)); > > Here’s another way to write this: > > for (auto* set : m_sets) > Adaptor::add(codeBlock, set, common.watchpoints.add(codeBlock)); > > I think the modern for loop makes this code look clearer. Just noticed you did a variation on that in your very next patch. Never mind! 256645 2015-07-10 22:49:21 -0700 2015-07-10 22:51:54 -0700 the patch blah.patch text/plain 4428 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTg2NzA0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDE1LTA3LTEwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg V2F0Y2hwb2ludHMgc2hvdWxkIGJlIGFsbG9jYXRlZCB3aXRoIEZhc3RNYWxsb2MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Njg3NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhpcyBpcyBp biBwcmVwYXJhdGlvbiBmb3IgYWRkaW5nIG5ldyBzdWJjbGFzc2VzIG9mIFdhdGNocG9pbnQuIFdo aWxlIHN0YXJ0aW5nIHRvIGRvIHRoaXMKKyAgICAgICAgSSByZWFsaXplZCB0aGF0IHRoZSB3YXkg V2F0Y2hwb2ludHMgYWxsb2NhdGVkIHRoZW1zZWx2ZXMgd2FzIHVudXN1YWwuCisKKyAgICAgICAg KiBieXRlY29kZS9Db2RlQmxvY2tKZXR0aXNvbmluZ1dhdGNocG9pbnQuaDoKKyAgICAgICAgKEpT Qzo6Q29kZUJsb2NrSmV0dGlzb25pbmdXYXRjaHBvaW50OjpDb2RlQmxvY2tKZXR0aXNvbmluZ1dh dGNocG9pbnQpOiBObyBuZWVkIGZvciB0aGUgZGVmYXVsdCBjb25zdHJ1Y3Rvci4KKyAgICAgICAg KiBieXRlY29kZS9XYXRjaHBvaW50Lmg6CisgICAgICAgIChKU0M6OldhdGNocG9pbnQ6OldhdGNo cG9pbnQpOiBUaGlzIHNob3VsZCBiZSBub25jb3B5YWJsZSBhbmQgZmFzdC1hbGxvY2F0ZWQuCisg ICAgICAgICogZGZnL0RGR0NvbW1vbkRhdGEuaDogVXNlIGEgQmFnPD4gaW5zdGVhZCBvZiBTZWdt ZW50ZWRWZWN0b3I8Pi4gQmFnIG1lYW5zICJtYWxsb2MgdGhpbmdzIGJ1dCBhbGxvdyBtZSB0byBm cmVlIHRoZW0gYWxsIGF0IG9uY2UiLCB3aGljaCBpcyB3aGF0IHdlIGFyZSBkb2luZyBoZXJlLgor ICAgICAgICAqIGRmZy9ERkdEZXNpcmVkV2F0Y2hwb2ludHMuaDoKKyAgICAgICAgKEpTQzo6REZH OjpHZW5lcmljRGVzaXJlZFdhdGNocG9pbnRzOjpyZWFsbHlBZGQpOiBVc2UgdGhlIEJhZzw+IEFQ SSByYXRoZXIgdGhhbiB0aGUgdmVyeSBhd2t3YXJkIFNlZ21lbnRlZFZlY3Rvcjw+IEFQSS4KKwog MjAxNS0wNy0xMCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIEFJ IGZvbGRpbmcgb2YgSXNPYmplY3RPck51bGwgaXMgYnJva2VuIGZvciBub24tb2JqZWN0IHR5cGVz IHRoYXQgbWF5IGJlIG51bGwKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9D b2RlQmxvY2tKZXR0aXNvbmluZ1dhdGNocG9pbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQ29kZUJsb2NrSmV0dGlzb25pbmdXYXRjaHBvaW50LmgJKHJl dmlzaW9uIDE4NjcwNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2tKZXR0aXNvbmluZ1dhdGNocG9pbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAK IC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDEzLCAyMDE1IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5 IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMzQsMTEgKzM0LDYgQEAg Y2xhc3MgQ29kZUJsb2NrOwogCiBjbGFzcyBDb2RlQmxvY2tKZXR0aXNvbmluZ1dhdGNocG9pbnQg OiBwdWJsaWMgV2F0Y2hwb2ludCB7CiBwdWJsaWM6Ci0gICAgQ29kZUJsb2NrSmV0dGlzb25pbmdX YXRjaHBvaW50KCkKLSAgICAgICAgOiBtX2NvZGVCbG9jaygwKQotICAgIHsKLSAgICB9Ci0gICAg CiAgICAgQ29kZUJsb2NrSmV0dGlzb25pbmdXYXRjaHBvaW50KENvZGVCbG9jayogY29kZUJsb2Nr KQogICAgICAgICA6IG1fY29kZUJsb2NrKGNvZGVCbG9jaykKICAgICB7CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvV2F0Y2hwb2ludC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9XYXRjaHBvaW50LmgJKHJldmlzaW9uIDE4NjcwNCkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9XYXRjaHBvaW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTI3LDYgKzI3LDggQEAKICNkZWZpbmUgV2F0Y2hwb2ludF9oCiAKICNpbmNsdWRl IDx3dGYvQXRvbWljcy5oPgorI2luY2x1ZGUgPHd0Zi9GYXN0TWFsbG9jLmg+CisjaW5jbHVkZSA8 d3RmL05vbmNvcHlhYmxlLmg+CiAjaW5jbHVkZSA8d3RmL1ByaW50U3RyZWFtLmg+CiAjaW5jbHVk ZSA8d3RmL1NlbnRpbmVsTGlua2VkTGlzdC5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRTYWZlUmVm Q291bnRlZC5oPgpAQCAtNjIsNiArNjQsOCBAQCBwcml2YXRlOgogfTsKIAogY2xhc3MgV2F0Y2hw b2ludCA6IHB1YmxpYyBCYXNpY1Jhd1NlbnRpbmVsTm9kZTxXYXRjaHBvaW50PiB7CisgICAgV1RG X01BS0VfTk9OQ09QWUFCTEUoV2F0Y2hwb2ludCk7CisgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FU RUQ7CiBwdWJsaWM6CiAgICAgV2F0Y2hwb2ludCgpCiAgICAgewpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdDb21tb25EYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdDb21tb25EYXRhLmgJKHJldmlzaW9uIDE4NjcwNCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ29tbW9uRGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC05 Nyw3ICs5Nyw3IEBAIHB1YmxpYzoKICAgICBWZWN0b3I8V2Vha1JlZmVyZW5jZVRyYW5zaXRpb24+ IHRyYW5zaXRpb25zOwogICAgIFZlY3RvcjxXcml0ZUJhcnJpZXI8SlNDZWxsPj4gd2Vha1JlZmVy ZW5jZXM7CiAgICAgVmVjdG9yPFdyaXRlQmFycmllcjxTdHJ1Y3R1cmU+PiB3ZWFrU3RydWN0dXJl UmVmZXJlbmNlczsKLSAgICBTZWdtZW50ZWRWZWN0b3I8Q29kZUJsb2NrSmV0dGlzb25pbmdXYXRj aHBvaW50LCAxPiB3YXRjaHBvaW50czsKKyAgICBCYWc8Q29kZUJsb2NrSmV0dGlzb25pbmdXYXRj aHBvaW50PiB3YXRjaHBvaW50czsKICAgICBWZWN0b3I8SnVtcFJlcGxhY2VtZW50PiBqdW1wUmVw bGFjZW1lbnRzOwogICAgIAogICAgIFJlZlB0cjxQcm9maWxlcjo6Q29tcGlsYXRpb24+IGNvbXBp bGF0aW9uOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdEZXNpcmVkV2F0Y2hw b2ludHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Rlc2ly ZWRXYXRjaHBvaW50cy5oCShyZXZpc2lvbiAxODY3MDQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR0Rlc2lyZWRXYXRjaHBvaW50cy5oCSh3b3JraW5nIGNvcHkpCkBAIC05MSwxMCAr OTEsOCBAQCBwdWJsaWM6CiAgICAgICAgIAogICAgICAgICB0eXBlbmFtZSBIYXNoU2V0PFdhdGNo cG9pbnRTZXRUeXBlKj46Oml0ZXJhdG9yIGl0ZXIgPSBtX3NldHMuYmVnaW4oKTsKICAgICAgICAg dHlwZW5hbWUgSGFzaFNldDxXYXRjaHBvaW50U2V0VHlwZSo+OjppdGVyYXRvciBlbmQgPSBtX3Nl dHMuZW5kKCk7Ci0gICAgICAgIGZvciAoOyBpdGVyICE9IGVuZDsgKytpdGVyKSB7Ci0gICAgICAg ICAgICBjb21tb24ud2F0Y2hwb2ludHMuYXBwZW5kKENvZGVCbG9ja0pldHRpc29uaW5nV2F0Y2hw b2ludChjb2RlQmxvY2spKTsKLSAgICAgICAgICAgIEFkYXB0b3I6OmFkZChjb2RlQmxvY2ssICpp dGVyLCAmY29tbW9uLndhdGNocG9pbnRzLmxhc3QoKSk7Ci0gICAgICAgIH0KKyAgICAgICAgZm9y ICg7IGl0ZXIgIT0gZW5kOyArK2l0ZXIpCisgICAgICAgICAgICBBZGFwdG9yOjphZGQoY29kZUJs b2NrLCAqaXRlciwgY29tbW9uLndhdGNocG9pbnRzLmFkZChjb2RlQmxvY2spKTsKICAgICAgICAg CiAgICAgICAgIG1fcmVhbGx5QWRkZWQgPSB0cnVlOwogICAgIH0K