156517 2016-04-12 14:01:57 -0700 Lets not iterate over the constant pool twice every time we link a code block 2016-04-12 15:42:06 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1183232 0 saam 2016-04-12 14:01:57 -0700 We had a second iteration just to find the symbol tables and clone them. Lets just combine the two iterations. 1183237 1 276274 saam 2016-04-12 14:08:31 -0700 Created attachment 276274 patch 1183238 2 276274 mark.lam 2016-04-12 14:12:53 -0700 Comment on attachment 276274 patch r=me 1183273 3 276274 commit-queue 2016-04-12 15:42:00 -0700 Comment on attachment 276274 patch Clearing flags on attachment: 276274 Committed r199394: <http://trac.webkit.org/changeset/199394> 1183274 4 commit-queue 2016-04-12 15:42:06 -0700 All reviewed patches have been landed. Closing bug. 276274 2016-04-12 14:08:31 -0700 2016-04-12 15:42:00 -0700 patch c-backup.diff text/plain 7219 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk5Mzg2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBA CisyMDE2LTA0LTEyICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IExldHMgbm90IGl0ZXJhdGUgb3ZlciB0aGUgY29uc3RhbnQgcG9vbCB0d2ljZSBldmVyeSB0aW1l IHdlIGxpbmsgYSBjb2RlIGJsb2NrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTY1MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJIGludHJvZHVjZWQgYSBzZWNvbmQgaXRlcmF0aW9uIG92ZXIgdGhlIGNv bnN0YW50IHBvb2wgd2hlbiBJIGltcGxlbWVudGVkCisgICAgICAgIGJsb2NrIHNjb3BpbmcuIEkg ZGlkIHRoaXMgYmVjYXVzZSB3ZSBtdXN0IGNsb25lIGFsbCB0aGUgc3ltYm9sIHRhYmxlcyB3aGVu CisgICAgICAgIHdlIGxpbmsgYSBDb2RlQmxvY2suIFdlIGNhbiBqdXN0IGRvIHRoaXMgY2xvbmlu ZyB3aGVuIHNldHRpbmcgdGhlIGNvbnN0YW50CisgICAgICAgIHJlZ2lzdGVycyBmb3IgdGhlIGZp cnN0IHRpbWUuIFRoZXJlIGlzIG5vIG5lZWQgdG8gaXRlcmF0ZSBvdmVyIHRoZSBjb25zdGFudAor ICAgICAgICBwb29sIGEgc2Vjb25kIHRpbWUuCisKKyAgICAgICAgKiBieXRlY29kZS9Db2RlQmxv Y2suY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKToKKyAgICAg ICAgKEpTQzo6Q29kZUJsb2NrOjp+Q29kZUJsb2NrKToKKyAgICAgICAgKEpTQzo6Q29kZUJsb2Nr OjpzZXRDb25zdGFudFJlZ2lzdGVycyk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6c2V0QWx0 ZXJuYXRpdmUpOgorICAgICAgICAqIGJ5dGVjb2RlL0NvZGVCbG9jay5oOgorICAgICAgICAoSlND OjpDb2RlQmxvY2s6OnJlcGxhY2VDb25zdGFudCk6CisgICAgICAgIChKU0M6OkNvZGVCbG9jazo6 c2V0Q29uc3RhbnRSZWdpc3RlcnMpOiBEZWxldGVkLgorCiAyMDE2LTA0LTEyICBTYWFtIGJhcmF0 aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIGlzTG9ja2VkKCkgYXNzZXJ0aW9uIGJy b2tlIGJ1aWxkcyBiZWNhdXNlIENvbmN1cnJlbnRKSVRMb2NrIGlzbid0IGFsd2F5cyBhIHJlYWwg bG9jay4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2suY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxvY2su Y3BwCShyZXZpc2lvbiAxOTkzODQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUv Q29kZUJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg4NiwzMSArMTg4Niw2IEBAIHZvaWQg Q29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICAgICAgICAgIG1fY29uc3Rh bnRSZWdpc3RlcnNbcmVnaXN0ZXJJbmRleF0uc2V0KCptX3ZtLCB0aGlzLCBtX2dsb2JhbE9iamVj dC0+anNDZWxsRm9yTGlua1RpbWVDb25zdGFudCh0eXBlKSk7CiAgICAgfQogCi0jaWYgIUFTU0VS VF9ESVNBQkxFRAotICAgIEhhc2hTZXQ8aW50LCBXVEY6OkludEhhc2g8aW50PiwgV1RGOjpVbnNp Z25lZFdpdGhaZXJvS2V5SGFzaFRyYWl0czxpbnQ+PiBjbG9uZWRDb25zdGFudFN5bWJvbFRhYmxl czsKLSNlbmRpZgotICAgIHsKLSNpZiAhQVNTRVJUX0RJU0FCTEVECi0gICAgICAgIEhhc2hTZXQ8 U3ltYm9sVGFibGUqPiBjbG9uZWRTeW1ib2xUYWJsZXM7Ci0jZW5kaWYKLSAgICAgICAgYm9vbCBo YXNUeXBlUHJvZmlsZXIgPSAhIXZtLnR5cGVQcm9maWxlcigpOwotICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgbV9jb25zdGFudFJlZ2lzdGVycy5zaXplKCk7IGkrKykgewotICAgICAg ICAgICAgaWYgKG1fY29uc3RhbnRSZWdpc3RlcnNbaV0uZ2V0KCkuaXNFbXB0eSgpKQotICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgaWYgKFN5bWJvbFRhYmxlKiBzeW1ib2xU YWJsZSA9IGpzRHluYW1pY0Nhc3Q8U3ltYm9sVGFibGUqPihtX2NvbnN0YW50UmVnaXN0ZXJzW2ld LmdldCgpKSkgewotICAgICAgICAgICAgICAgIEFTU0VSVChjbG9uZWRTeW1ib2xUYWJsZXMuYWRk KHN5bWJvbFRhYmxlKS5pc05ld0VudHJ5KTsKLSAgICAgICAgICAgICAgICBpZiAoaGFzVHlwZVBy b2ZpbGVyKSB7Ci0gICAgICAgICAgICAgICAgICAgIENvbmN1cnJlbnRKSVRMb2NrZXIgbG9ja2Vy KHN5bWJvbFRhYmxlLT5tX2xvY2spOwotICAgICAgICAgICAgICAgICAgICBzeW1ib2xUYWJsZS0+ cHJlcGFyZUZvclR5cGVQcm9maWxpbmcobG9ja2VyKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgbV9jb25zdGFudFJlZ2lzdGVyc1tpXS5zZXQoKm1fdm0sIHRoaXMsIHN5bWJv bFRhYmxlLT5jbG9uZVNjb3BlUGFydCgqbV92bSkpOwotI2lmICFBU1NFUlRfRElTQUJMRUQKLSAg ICAgICAgICAgICAgICBjbG9uZWRDb25zdGFudFN5bWJvbFRhYmxlcy5hZGQoaSArIEZpcnN0Q29u c3RhbnRSZWdpc3RlckluZGV4KTsKLSNlbmRpZgotICAgICAgICAgICAgfQotICAgICAgICB9Ci0g ICAgfQotCiAgICAgLy8gV2UgYWxyZWFkeSBoYXZlIHRoZSBjbG9uZWQgc3ltYm9sIHRhYmxlIGZv ciB0aGUgbW9kdWxlIGVudmlyb25tZW50IHNpbmNlIHdlIG5lZWQgdG8gaW5zdGFudGlhdGUKICAg ICAvLyB0aGUgbW9kdWxlIGVudmlyb25tZW50cyBiZWZvcmUgbGlua2luZyB0aGUgY29kZSBibG9j ay4gV2UgcmVwbGFjZSB0aGUgc3RvcmVkIHN5bWJvbCB0YWJsZSB3aXRoIHRoZSBhbHJlYWR5IGNs b25lZCBvbmUuCiAgICAgaWYgKFVubGlua2VkTW9kdWxlUHJvZ3JhbUNvZGVCbG9jayogdW5saW5r ZWRNb2R1bGVQcm9ncmFtQ29kZUJsb2NrID0ganNEeW5hbWljQ2FzdDxVbmxpbmtlZE1vZHVsZVBy b2dyYW1Db2RlQmxvY2sqPih1bmxpbmtlZENvZGVCbG9jaykpIHsKQEAgLTIxMDYsMTQgKzIwODEs NiBAQCB2b2lkIENvZGVCbG9jazo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBTCiAgICAgICAgIGNh c2Ugb3BfZ2V0X2FycmF5X2xlbmd0aDoKICAgICAgICAgICAgIENSQVNIKCk7CiAKLSNpZiAhQVNT RVJUX0RJU0FCTEVECi0gICAgICAgIGNhc2Ugb3BfY3JlYXRlX2xleGljYWxfZW52aXJvbm1lbnQ6 IHsKLSAgICAgICAgICAgIGludCBzeW1ib2xUYWJsZUluZGV4ID0gcGNbM10udS5vcGVyYW5kOwot ICAgICAgICAgICAgQVNTRVJUKGNsb25lZENvbnN0YW50U3ltYm9sVGFibGVzLmNvbnRhaW5zKHN5 bWJvbFRhYmxlSW5kZXgpKTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0jZW5kaWYK LQogICAgICAgICBjYXNlIG9wX3Jlc29sdmVfc2NvcGU6IHsKICAgICAgICAgICAgIGNvbnN0IElk ZW50aWZpZXImIGlkZW50ID0gaWRlbnRpZmllcihwY1szXS51Lm9wZXJhbmQpOwogICAgICAgICAg ICAgUmVzb2x2ZVR5cGUgdHlwZSA9IHN0YXRpY19jYXN0PFJlc29sdmVUeXBlPihwY1s0XS51Lm9w ZXJhbmQpOwpAQCAtMjE3Nyw3ICsyMTQ0LDYgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0 aW9uKFZNJiB2bSwgUwogICAgICAgICAgICAgICAgIC8vIE9ubHkgZG8gd2F0Y2hpbmcgaWYgdGhl IHByb3BlcnR5IHdlJ3JlIHB1dHRpbmcgdG8gaXMgbm90IGFub255bW91cy4KICAgICAgICAgICAg ICAgICBpZiAoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHBjWzJdLnUub3BlcmFuZCkgIT0gVUlOVF9N QVgpIHsKICAgICAgICAgICAgICAgICAgICAgaW50IHN5bWJvbFRhYmxlSW5kZXggPSBwY1s1XS51 Lm9wZXJhbmQ7Ci0gICAgICAgICAgICAgICAgICAgIEFTU0VSVChjbG9uZWRDb25zdGFudFN5bWJv bFRhYmxlcy5jb250YWlucyhzeW1ib2xUYWJsZUluZGV4KSk7CiAgICAgICAgICAgICAgICAgICAg IFN5bWJvbFRhYmxlKiBzeW1ib2xUYWJsZSA9IGpzQ2FzdDxTeW1ib2xUYWJsZSo+KGdldENvbnN0 YW50KHN5bWJvbFRhYmxlSW5kZXgpKTsKICAgICAgICAgICAgICAgICAgICAgY29uc3QgSWRlbnRp ZmllciYgaWRlbnQgPSBpZGVudGlmaWVyKHBjWzJdLnUub3BlcmFuZCk7CiAgICAgICAgICAgICAg ICAgICAgIENvbmN1cnJlbnRKSVRMb2NrZXIgbG9ja2VyKHN5bWJvbFRhYmxlLT5tX2xvY2spOwpA QCAtMjI0OCw3ICsyMjE0LDYgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2 bSwgUwogICAgICAgICAgICAgfQogICAgICAgICAgICAgY2FzZSBQcm9maWxlVHlwZUJ5dGVjb2Rl TG9jYWxseVJlc29sdmVkOiB7CiAgICAgICAgICAgICAgICAgaW50IHN5bWJvbFRhYmxlSW5kZXgg PSBwY1syXS51Lm9wZXJhbmQ7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKGNsb25lZENvbnN0YW50 U3ltYm9sVGFibGVzLmNvbnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgpKTsKICAgICAgICAgICAgICAg ICBTeW1ib2xUYWJsZSogc3ltYm9sVGFibGUgPSBqc0Nhc3Q8U3ltYm9sVGFibGUqPihnZXRDb25z dGFudChzeW1ib2xUYWJsZUluZGV4KSk7CiAgICAgICAgICAgICAgICAgY29uc3QgSWRlbnRpZmll ciYgaWRlbnQgPSBpZGVudGlmaWVyKHBjWzRdLnUub3BlcmFuZCk7CiAgICAgICAgICAgICAgICAg Q29uY3VycmVudEpJVExvY2tlciBsb2NrZXIoc3ltYm9sVGFibGUtPm1fbG9jayk7CkBAIC0yNDE5 LDYgKzIzODQsMzEgQEAgQ29kZUJsb2NrOjp+Q29kZUJsb2NrKCkKICNlbmRpZiAvLyBFTkFCTEUo SklUKQogfQogCit2b2lkIENvZGVCbG9jazo6c2V0Q29uc3RhbnRSZWdpc3RlcnMoY29uc3QgVmVj dG9yPFdyaXRlQmFycmllcjxVbmtub3duPj4mIGNvbnN0YW50cywgY29uc3QgVmVjdG9yPFNvdXJj ZUNvZGVSZXByZXNlbnRhdGlvbj4mIGNvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbikK K3sKKyAgICBBU1NFUlQoY29uc3RhbnRzLnNpemUoKSA9PSBjb25zdGFudHNTb3VyY2VDb2RlUmVw cmVzZW50YXRpb24uc2l6ZSgpKTsKKyAgICBzaXplX3QgY291bnQgPSBjb25zdGFudHMuc2l6ZSgp OworICAgIG1fY29uc3RhbnRSZWdpc3RlcnMucmVzaXplVG9GaXQoY291bnQpOworICAgIGJvb2wg aGFzVHlwZVByb2ZpbGVyID0gISFtX3ZtLT50eXBlUHJvZmlsZXIoKTsKKyAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IGNvdW50OyBpKyspIHsKKyAgICAgICAgSlNWYWx1ZSBjb25zdGFudCA9IGNv bnN0YW50c1tpXS5nZXQoKTsKKworICAgICAgICBpZiAoIWNvbnN0YW50LmlzRW1wdHkoKSkgewor ICAgICAgICAgICAgaWYgKFN5bWJvbFRhYmxlKiBzeW1ib2xUYWJsZSA9IGpzRHluYW1pY0Nhc3Q8 U3ltYm9sVGFibGUqPihjb25zdGFudCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoaGFzVHlwZVBy b2ZpbGVyKSB7CisgICAgICAgICAgICAgICAgICAgIENvbmN1cnJlbnRKSVRMb2NrZXIgbG9ja2Vy KHN5bWJvbFRhYmxlLT5tX2xvY2spOworICAgICAgICAgICAgICAgICAgICBzeW1ib2xUYWJsZS0+ cHJlcGFyZUZvclR5cGVQcm9maWxpbmcobG9ja2VyKTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgY29uc3RhbnQgPSBzeW1ib2xUYWJsZS0+Y2xvbmVTY29wZVBhcnQoKm1fdm0p OworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgbV9jb25zdGFudFJlZ2lzdGVy c1tpXS5zZXQoKm1fdm0sIHRoaXMsIGNvbnN0YW50KTsKKyAgICB9CisKKyAgICBtX2NvbnN0YW50 c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbiA9IGNvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRh dGlvbjsKK30KKwogdm9pZCBDb2RlQmxvY2s6OnNldEFsdGVybmF0aXZlKFZNJiB2bSwgQ29kZUJs b2NrKiBhbHRlcm5hdGl2ZSkKIHsKICAgICBtX2FsdGVybmF0aXZlLnNldCh2bSwgdGhpcywgYWx0 ZXJuYXRpdmUpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0NvZGVCbG9j ay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9Db2RlQmxv Y2suaAkocmV2aXNpb24gMTk5MzgzKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0NvZGVCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC05MzYsMTUgKzkzNiw3IEBAIHByaXZhdGU6 CiAKICAgICB2b2lkIHVwZGF0ZUFsbFByZWRpY3Rpb25zQW5kQ291bnRMaXZlbmVzcyh1bnNpZ25l ZCYgbnVtYmVyT2ZMaXZlTm9uQXJndW1lbnRWYWx1ZVByb2ZpbGVzLCB1bnNpZ25lZCYgbnVtYmVy T2ZTYW1wbGVzSW5Qcm9maWxlcyk7CiAKLSAgICB2b2lkIHNldENvbnN0YW50UmVnaXN0ZXJzKGNv bnN0IFZlY3RvcjxXcml0ZUJhcnJpZXI8VW5rbm93bj4+JiBjb25zdGFudHMsIGNvbnN0IFZlY3Rv cjxTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24+JiBjb25zdGFudHNTb3VyY2VDb2RlUmVwcmVzZW50 YXRpb24pCi0gICAgewotICAgICAgICBBU1NFUlQoY29uc3RhbnRzLnNpemUoKSA9PSBjb25zdGFu dHNTb3VyY2VDb2RlUmVwcmVzZW50YXRpb24uc2l6ZSgpKTsKLSAgICAgICAgc2l6ZV90IGNvdW50 ID0gY29uc3RhbnRzLnNpemUoKTsKLSAgICAgICAgbV9jb25zdGFudFJlZ2lzdGVycy5yZXNpemVU b0ZpdChjb3VudCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY291bnQ7IGkrKykK LSAgICAgICAgICAgIG1fY29uc3RhbnRSZWdpc3RlcnNbaV0uc2V0KCptX3ZtLCB0aGlzLCBjb25z dGFudHNbaV0uZ2V0KCkpOwotICAgICAgICBtX2NvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRh dGlvbiA9IGNvbnN0YW50c1NvdXJjZUNvZGVSZXByZXNlbnRhdGlvbjsKLSAgICB9CisgICAgdm9p ZCBzZXRDb25zdGFudFJlZ2lzdGVycyhjb25zdCBWZWN0b3I8V3JpdGVCYXJyaWVyPFVua25vd24+ PiYgY29uc3RhbnRzLCBjb25zdCBWZWN0b3I8U291cmNlQ29kZVJlcHJlc2VudGF0aW9uPiYgY29u c3RhbnRzU291cmNlQ29kZVJlcHJlc2VudGF0aW9uKTsKIAogICAgIHZvaWQgcmVwbGFjZUNvbnN0 YW50KGludCBpbmRleCwgSlNWYWx1ZSB2YWx1ZSkKICAgICB7Cg==