185456 2018-05-08 16:42:20 -0700 Replace multiple Watchpoint Set fireAll() methods with templates 2018-05-08 18:12:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff commit-queue ews-watchlist keith_miller mark.lam saam webkit-bug-importer oldest_to_newest 1422028 0 msaboff 2018-05-08 16:42:20 -0700 There are multiple fireAll() methods with the same logic taking slightly different parameters in both WatchpointSet and InlineWatchpointSet. These can be simplified with templated methods. 1422036 1 339899 msaboff 2018-05-08 16:47:24 -0700 Created attachment 339899 Patch 1422088 2 339899 commit-queue 2018-05-08 18:11:45 -0700 Comment on attachment 339899 Patch Clearing flags on attachment: 339899 Committed r231534: <https://trac.webkit.org/changeset/231534> 1422089 3 commit-queue 2018-05-08 18:11:47 -0700 All reviewed patches have been landed. Closing bug. 1422090 4 webkit-bug-importer 2018-05-08 18:12:20 -0700 <rdar://problem/40078983> 339899 2018-05-08 16:47:24 -0700 2018-05-08 18:11:45 -0700 Patch 185456.patch text/plain 3137 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjMxNTIzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDE4LTA1LTA4ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFJlcGxhY2UgbXVsdGlwbGUgV2F0Y2hwb2ludCBTZXQgZmlyZUFsbCgpIG1ldGhvZHMgd2l0 aCB0ZW1wbGF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NTQ1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJlZmFjdG9yZWQgdG8gbWluaW1pemUgZHVwbGljYXRlIGNvZGUuCisKKyAgICAgICAgKiBi eXRlY29kZS9XYXRjaHBvaW50Lmg6CisgICAgICAgIChKU0M6OldhdGNocG9pbnRTZXQ6OmZpcmVB bGwpOgorICAgICAgICAoSlNDOjpJbmxpbmVXYXRjaHBvaW50U2V0OjpmaXJlQWxsKToKKwogMjAx OC0wNS0wOCAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIERGRzo6 Rmxvd01hcDo6cmVzaXplKCkgc2hvdWxkbid0IHJlc2l6ZSB0aGUgc2hhZG93IG1hcCB1bmxlc3Mg d2UncmUgaW4gU1NBCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvV2F0Y2hw b2ludC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9XYXRj aHBvaW50LmgJKHJldmlzaW9uIDIzMTUxOCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRl Y29kZS9XYXRjaHBvaW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MywyOCArMTUzLDE1IEBAIHB1 YmxpYzoKICAgICAgICAgbV9zdGF0ZSA9IElzV2F0Y2hlZDsKICAgICAgICAgV1RGOjpzdG9yZVN0 b3JlRmVuY2UoKTsKICAgICB9Ci0gICAgCi0gICAgdm9pZCBmaXJlQWxsKFZNJiB2bSwgY29uc3Qg RmlyZURldGFpbCYgZGV0YWlsKQotICAgIHsKLSAgICAgICAgaWYgKExJS0VMWShtX3N0YXRlICE9 IElzV2F0Y2hlZCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGZpcmVBbGxTbG93KHZt LCBkZXRhaWwpOwotICAgIH0KLSAgICAKLSAgICB2b2lkIGZpcmVBbGwoVk0mIHZtLCBEZWZlcnJl ZFdhdGNocG9pbnRGaXJlKiBkZWZlcnJlZFdhdGNocG9pbnRzKQotICAgIHsKLSAgICAgICAgaWYg KExJS0VMWShtX3N0YXRlICE9IElzV2F0Y2hlZCkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIGZpcmVBbGxTbG93KHZtLCBkZWZlcnJlZFdhdGNocG9pbnRzKTsKLSAgICB9CiAKLSAgICB2 b2lkIGZpcmVBbGwoVk0mIHZtLCBjb25zdCBjaGFyKiByZWFzb24pCisgICAgdGVtcGxhdGUgPHR5 cGVuYW1lIFQ+CisgICAgdm9pZCBmaXJlQWxsKFZNJiB2bSwgVCYgZmlyZURldGFpbHMpCiAgICAg ewogICAgICAgICBpZiAoTElLRUxZKG1fc3RhdGUgIT0gSXNXYXRjaGVkKSkKICAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgZmlyZUFsbFNsb3codm0sIHJlYXNvbik7CisgICAgICAgIGZpcmVB bGxTbG93KHZtLCBmaXJlRGV0YWlscyk7CiAgICAgfQotICAgIAorCiAgICAgdm9pZCB0b3VjaChW TSYgdm0sIGNvbnN0IEZpcmVEZXRhaWwmIGRldGFpbCkKICAgICB7CiAgICAgICAgIGlmIChzdGF0 ZSgpID09IENsZWFyV2F0Y2hwb2ludCkKQEAgLTIxMCw3ICsxOTcsNyBAQCBwdWJsaWM6CiAgICAg aW50OF90KiBhZGRyZXNzT2ZTZXRJc05vdEVtcHR5KCkgeyByZXR1cm4gJm1fc2V0SXNOb3RFbXB0 eTsgfQogICAgIAogICAgIEpTX0VYUE9SVF9QUklWQVRFIHZvaWQgZmlyZUFsbFNsb3coVk0mLCBj b25zdCBGaXJlRGV0YWlsJik7IC8vIENhbGwgb25seSBpZiB5b3UndmUgY2hlY2tlZCBpc1dhdGNo ZWQuCi0gICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBmaXJlQWxsU2xvdyhWTSYsIERlZmVycmVk V2F0Y2hwb2ludEZpcmUqIGRlZmVycmVkV2F0Y2hwb2ludHMpOworICAgIEpTX0VYUE9SVF9QUklW QVRFIHZvaWQgZmlyZUFsbFNsb3coVk0mLCBEZWZlcnJlZFdhdGNocG9pbnRGaXJlKiBkZWZlcnJl ZFdhdGNocG9pbnRzKTsgLy8gRGl0dG8uCiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCBmaXJl QWxsU2xvdyhWTSYsIGNvbnN0IGNoYXIqIHJlYXNvbik7IC8vIERpdHRvLgogICAgIAogcHJpdmF0 ZToKQEAgLTMwNiwyMyArMjkzLDEyIEBAIHB1YmxpYzoKICAgICAgICAgQVNTRVJUKGRlY29kZVN0 YXRlKG1fZGF0YSkgIT0gSXNJbnZhbGlkYXRlZCk7CiAgICAgICAgIG1fZGF0YSA9IGVuY29kZVN0 YXRlKElzV2F0Y2hlZCk7CiAgICAgfQotICAgIAotICAgIHZvaWQgZmlyZUFsbChWTSYgdm0sIGNv bnN0IEZpcmVEZXRhaWwmIGRldGFpbCkKLSAgICB7Ci0gICAgICAgIGlmIChpc0ZhdCgpKSB7Ci0g ICAgICAgICAgICBmYXQoKS0+ZmlyZUFsbCh2bSwgZGV0YWlsKTsKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgfQotICAgICAgICBpZiAoZGVjb2RlU3RhdGUobV9kYXRhKSA9PSBDbGVhcldh dGNocG9pbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIG1fZGF0YSA9IGVuY29kZVN0 YXRlKElzSW52YWxpZGF0ZWQpOwotICAgICAgICBXVEY6OnN0b3JlU3RvcmVGZW5jZSgpOwotICAg IH0KLSAgICAKLSAgICB2b2lkIGZpcmVBbGwoVk0mIHZtLCBEZWZlcnJlZFdhdGNocG9pbnRGaXJl KiBkZWZlcnJlZCkKKworICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPgorICAgIHZvaWQgZmlyZUFs bChWTSYgdm0sIFQgZmlyZURldGFpbHMpCiAgICAgewogICAgICAgICBpZiAoaXNGYXQoKSkgewot ICAgICAgICAgICAgZmF0KCktPmZpcmVBbGwodm0sIGRlZmVycmVkKTsKKyAgICAgICAgICAgIGZh dCgpLT5maXJlQWxsKHZtLCBmaXJlRGV0YWlscyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KICAgICAgICAgaWYgKGRlY29kZVN0YXRlKG1fZGF0YSkgPT0gQ2xlYXJXYXRjaHBvaW50 KQo=