180238 2017-11-30 23:51:19 -0800 [FTL] Optimize ObjectAllocationSinking mergePointerSets by using removeIf 2018-01-04 07:52:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist fpizlo keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1376734 0 ysuzuki 2017-11-30 23:51:19 -0800 [FTL] Optimize ObjectAllocationSinking mergePointerSets by using removeIf 1376735 1 328074 ysuzuki 2017-11-30 23:53:59 -0800 Created attachment 328074 Patch 1385644 2 328074 saam 2018-01-03 18:08:29 -0800 Comment on attachment 328074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=328074&action=review > Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp:620 > + if (my.contains(entry.key)) > + continue; > + escape(entry.value); I know you copied this from below, but I think this is better as: if (!my.contains(entry.key)) escape(entry.value); 1385807 3 328074 ysuzuki 2018-01-04 07:43:58 -0800 Comment on attachment 328074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=328074&action=review >> Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp:620 >> + escape(entry.value); > > I know you copied this from below, but I think this is better as: > if (!my.contains(entry.key)) > escape(entry.value); OK, fixed. 1385808 4 ysuzuki 2018-01-04 07:51:56 -0800 Committed r226406: <https://trac.webkit.org/changeset/226406> 1385809 5 webkit-bug-importer 2018-01-04 07:52:22 -0800 <rdar://problem/36297454> 328074 2017-11-30 23:53:59 -0800 2018-01-03 18:07:01 -0800 Patch bug-180238-20171201165358.patch text/plain 5066 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NTA1NjcwYjdkNTdkM2VmYTllZmI4YTI3MTFkOGQ1NmI5YjI5YmZjLi4wNTAyNDRlMWE4Y2IyMGFk NWUxOWRiZWJkNTc2ZjVhYWRmYzAyNTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwxNiBAQAogMjAxNy0xMS0zMCAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWls LmNvbT4KIAorICAgICAgICBbRlRMXSBPcHRpbWl6ZSBPYmplY3RBbGxvY2F0aW9uU2lua2luZyBt ZXJnZVBvaW50ZXJTZXRzIGJ5IHVzaW5nIHJlbW92ZUlmCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAyMzgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZSBjYW4gb3B0aW1pemUgT2JqZWN0QWxsb2NhdGlv blNpbmtpbmcgYSBiaXQgYnkgdXNpbmcgcmVtb3ZlSWYuCisKKyAgICAgICAgKiBkZmcvREZHT2Jq ZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHA6CisKKzIwMTctMTEtMzAgIFl1c3VrZSBTdXp1 a2kgIDx1dGF0YW5lLnRlYUBnbWFpbC5jb20+CisKICAgICAgICAgW0pTQ10gUmVtb3ZlIGVhc3kg dG9SZW1vdmUgJiBtYXAucmVtb3ZlKCkgdXNlIGluIE9BUyBwaGFzZQogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwMjA4CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5n UGhhc2UuY3BwCmluZGV4IDgxNzFiNmVjZDY1ODUzYjliMjU2ZDgyMzVlZDVhZDRiNWYzYTY4NTUu Ljc2OWYzNDc1YjZiMzAxMTUyOTQ4NjUwZjMxYWM3ZmMxNDJhYWZiMzAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPYmplY3RBbGxvY2F0aW9uU2lu a2luZ1BoYXNlLmNwcApAQCAtMTQzLDYgKzE0Myw4IEBAIGNsYXNzIEFsbG9jYXRpb24gewogICAg IC8vIG1hdGVyaWFsaXphdGlvbgogICAgIGVudW0gY2xhc3MgS2luZCB7IEVzY2FwZWQsIE9iamVj dCwgQWN0aXZhdGlvbiwgRnVuY3Rpb24sIEdlbmVyYXRvckZ1bmN0aW9uLCBBc3luY0Z1bmN0aW9u LCBBc3luY0dlbmVyYXRvckZ1bmN0aW9uIH07CiAKKyAgICB1c2luZyBGaWVsZHMgPSBIYXNoTWFw PFByb21vdGVkTG9jYXRpb25EZXNjcmlwdG9yLCBOb2RlKj47CisKICAgICBleHBsaWNpdCBBbGxv Y2F0aW9uKE5vZGUqIGlkZW50aWZpZXIgPSBudWxscHRyLCBLaW5kIGtpbmQgPSBLaW5kOjpFc2Nh cGVkKQogICAgICAgICA6IG1faWRlbnRpZmllcihpZGVudGlmaWVyKQogICAgICAgICAsIG1fa2lu ZChraW5kKQpAQCAtMTUwLDcgKzE1MiwxMiBAQCBjbGFzcyBBbGxvY2F0aW9uIHsKICAgICB9CiAK IAotICAgIGNvbnN0IEhhc2hNYXA8UHJvbW90ZWRMb2NhdGlvbkRlc2NyaXB0b3IsIE5vZGUqPiYg ZmllbGRzKCkgY29uc3QKKyAgICBjb25zdCBGaWVsZHMmIGZpZWxkcygpIGNvbnN0CisgICAgewor ICAgICAgICByZXR1cm4gbV9maWVsZHM7CisgICAgfQorCisgICAgRmllbGRzJiBmaWVsZHMoKQog ICAgIHsKICAgICAgICAgcmV0dXJuIG1fZmllbGRzOwogICAgIH0KQEAgLTMwMSw3ICszMDgsNyBA QCBjbGFzcyBBbGxvY2F0aW9uIHsKIHByaXZhdGU6CiAgICAgTm9kZSogbV9pZGVudGlmaWVyOyAv LyBUaGlzIGlzIHRoZSBhY3R1YWwgbm9kZSB0aGF0IGNyZWF0ZWQgdGhlIGFsbG9jYXRpb24KICAg ICBLaW5kIG1fa2luZDsKLSAgICBIYXNoTWFwPFByb21vdGVkTG9jYXRpb25EZXNjcmlwdG9yLCBO b2RlKj4gbV9maWVsZHM7CisgICAgRmllbGRzIG1fZmllbGRzOwogICAgIFJlZ2lzdGVyZWRTdHJ1 Y3R1cmVTZXQgbV9zdHJ1Y3R1cmVzOwogfTsKIApAQCAtNDY4LDI1ICs0NzUsMTIgQEAgY2xhc3Mg TG9jYWxIZWFwIHsKICAgICAgICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGZpZWxkRW50cnkg OiBhbGxvY2F0aW9uSXRlci0+dmFsdWUuZmllbGRzKCkpCiAgICAgICAgICAgICAgICAgICAgIHRv RXNjYXBlLmFkZFZvaWQoZmllbGRFbnRyeS52YWx1ZSk7CiAgICAgICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgICAgIG1lcmdlUG9pbnRlclNldHMoCi0gICAgICAgICAgICAgICAgICAgIGFs bG9jYXRpb25FbnRyeS52YWx1ZS5maWVsZHMoKSwgYWxsb2NhdGlvbkl0ZXItPnZhbHVlLmZpZWxk cygpLAotICAgICAgICAgICAgICAgICAgICBbJl0gKE5vZGUqIGlkZW50aWZpZXIpIHsKLSAgICAg ICAgICAgICAgICAgICAgICAgIHRvRXNjYXBlLmFkZFZvaWQoaWRlbnRpZmllcik7Ci0gICAgICAg ICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAgICAgICAgIFsmXSAoUHJvbW90ZWRMb2NhdGlv bkRlc2NyaXB0b3IgZmllbGQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGFsbG9jYXRpb25F bnRyeS52YWx1ZS5yZW1vdmUoZmllbGQpOwotICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAg ICAgICAgICAgICBtZXJnZVBvaW50ZXJTZXRzKGFsbG9jYXRpb25FbnRyeS52YWx1ZS5maWVsZHMo KSwgYWxsb2NhdGlvbkl0ZXItPnZhbHVlLmZpZWxkcygpLCB0b0VzY2FwZSk7CiAgICAgICAgICAg ICAgICAgYWxsb2NhdGlvbkVudHJ5LnZhbHVlLm1lcmdlU3RydWN0dXJlcyhhbGxvY2F0aW9uSXRl ci0+dmFsdWUuc3RydWN0dXJlcygpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogCi0gICAg ICAgIG1lcmdlUG9pbnRlclNldHMobV9wb2ludGVycywgb3RoZXIubV9wb2ludGVycywKLSAgICAg ICAgICAgIFsmXSAoTm9kZSogaWRlbnRpZmllcikgewotICAgICAgICAgICAgICAgIHRvRXNjYXBl LmFkZFZvaWQoaWRlbnRpZmllcik7Ci0gICAgICAgICAgICB9LAotICAgICAgICAgICAgWyZdIChO b2RlKiBmaWVsZCkgewotICAgICAgICAgICAgICAgIG1fcG9pbnRlcnMucmVtb3ZlKGZpZWxkKTsK LSAgICAgICAgICAgIH0pOworICAgICAgICBtZXJnZVBvaW50ZXJTZXRzKG1fcG9pbnRlcnMsIG90 aGVyLm1fcG9pbnRlcnMsIHRvRXNjYXBlKTsKIAogICAgICAgICBmb3IgKE5vZGUqIGlkZW50aWZp ZXIgOiB0b0VzY2FwZSkKICAgICAgICAgICAgIGVzY2FwZUFsbG9jYXRpb24oaWRlbnRpZmllcik7 CkBAIC02MTMsMzAgKzYwNywzMSBAQCBjbGFzcyBMb2NhbEhlYXAgewogICAgIC8vICAzOiBHZXRC eU9mZnNldChAMCwgeCkKICAgICAvLyAgNDogR2V0QnlPZmZzZXQoQDMsIHZhbCkKICAgICAvLyAg LTogUmV0dXJuKEA0KQotICAgIHRlbXBsYXRlPHR5cGVuYW1lIEtleSwgdHlwZW5hbWUgRXNjYXBl RnVuY3RvciwgdHlwZW5hbWUgUmVtb3ZlRnVuY3Rvcj4KLSAgICB2b2lkIG1lcmdlUG9pbnRlclNl dHMoCi0gICAgICAgIGNvbnN0IEhhc2hNYXA8S2V5LCBOb2RlKj4mIG15LCBjb25zdCBIYXNoTWFw PEtleSwgTm9kZSo+JiB0aGVpciwKLSAgICAgICAgY29uc3QgRXNjYXBlRnVuY3RvciYgZXNjYXBl LCBjb25zdCBSZW1vdmVGdW5jdG9yJiByZW1vdmUpCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgS2V5 PgorICAgIHN0YXRpYyB2b2lkIG1lcmdlUG9pbnRlclNldHMoSGFzaE1hcDxLZXksIE5vZGUqPiYg bXksIGNvbnN0IEhhc2hNYXA8S2V5LCBOb2RlKj4mIHRoZWlyLCBOb2RlU2V0JiB0b0VzY2FwZSkK ICAgICB7Ci0gICAgICAgIFZlY3RvcjxLZXk+IHRvUmVtb3ZlOwotICAgICAgICBmb3IgKGNvbnN0 IGF1dG8mIGVudHJ5IDogbXkpIHsKKyAgICAgICAgYXV0byBlc2NhcGUgPSBbJl0gKE5vZGUqIGlk ZW50aWZpZXIpIHsKKyAgICAgICAgICAgIHRvRXNjYXBlLmFkZFZvaWQoaWRlbnRpZmllcik7Cisg ICAgICAgIH07CisKKyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBlbnRyeSA6IHRoZWlyKSB7Cisg ICAgICAgICAgICBpZiAobXkuY29udGFpbnMoZW50cnkua2V5KSkKKyAgICAgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgICAgIGVzY2FwZShlbnRyeS52YWx1ZSk7CisgICAgICAgIH0KKyAg ICAgICAgbXkucmVtb3ZlSWYoWyZdIChjb25zdCBhdXRvJiBlbnRyeSkgewogICAgICAgICAgICAg YXV0byBpdGVyID0gdGhlaXIuZmluZChlbnRyeS5rZXkpOwogICAgICAgICAgICAgaWYgKGl0ZXIg PT0gdGhlaXIuZW5kKCkpIHsKLSAgICAgICAgICAgICAgICB0b1JlbW92ZS5hcHBlbmQoZW50cnku a2V5KTsKICAgICAgICAgICAgICAgICBlc2NhcGUoZW50cnkudmFsdWUpOwotICAgICAgICAgICAg fSBlbHNlIGlmIChpdGVyLT52YWx1ZSAhPSBlbnRyeS52YWx1ZSkgewotICAgICAgICAgICAgICAg IHRvUmVtb3ZlLmFwcGVuZChlbnRyeS5rZXkpOworICAgICAgICAgICAgICAgIHJldHVybiB0cnVl OworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGl0ZXItPnZhbHVlICE9IGVudHJ5LnZh bHVlKSB7CiAgICAgICAgICAgICAgICAgZXNjYXBlKGVudHJ5LnZhbHVlKTsKICAgICAgICAgICAg ICAgICBlc2NhcGUoaXRlci0+dmFsdWUpOworICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIGZvciAoY29uc3QgYXV0byYgZW50cnkg OiB0aGVpcikgewotICAgICAgICAgICAgaWYgKG15LmNvbnRhaW5zKGVudHJ5LmtleSkpCi0gICAg ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBlc2NhcGUoZW50cnkudmFsdWUpOwot ICAgICAgICB9Ci0gICAgICAgIGZvciAoS2V5IGtleSA6IHRvUmVtb3ZlKQotICAgICAgICAgICAg cmVtb3ZlKGtleSk7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIH0pOwogICAg IH0KIAogICAgIHZvaWQgZXNjYXBlQWxsb2NhdGlvbihOb2RlKiBpZGVudGlmaWVyKQo=