118768 2013-07-16 20:50:54 -0700 Remove a bunch of redundant checks for empty string in StringImpl 2013-08-02 20:32:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin cmarcelo commit-queue oldest_to_newest 909126 0 benjamin 2013-07-16 20:50:54 -0700 Remove a bunch of redundant checks for empty string in StringImpl 909146 1 206850 benjamin 2013-07-16 21:40:33 -0700 Created attachment 206850 Patch 914000 2 206850 rniwa 2013-08-01 21:06:44 -0700 Comment on attachment 206850 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206850&action=review > Source/WTF/wtf/text/StringImpl.cpp:416 > int32_t length = m_length; Can we add an assertion that m_length is non-zero here? > Source/WTF/wtf/text/StringImpl.cpp:448 > Ditto. 914340 3 benjamin 2013-08-02 20:32:17 -0700 Committed r153686: <http://trac.webkit.org/changeset/153686> 206850 2013-07-16 21:40:33 -0700 2013-08-01 21:06:44 -0700 Patch bug-118768-20130716214033.patch text/plain 7419 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDlmMWI5ZGNjZjljZDliNTI5NGVlNjdj MWYyZTIyNTgzNmU5MGJmMTcuLjNjMjk0MjIzYTNjZjU5YjU1OWU2NmI0MGNhZjI0MzE1NWY1NzA0 OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTMtMDctMTYgIEJlbmphbWluIFBvdWxhaW4gIDxi ZW5qYW1pbkB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBhIGJ1bmNoIG9mIHJlZHVuZGFu dCBjaGVja3MgZm9yIGVtcHR5IHN0cmluZyBpbiBTdHJpbmdJbXBsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTg3NjgKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZmlyc3QgdGhpbmcgZG9uZSBieSBj cmVhdGVVbmluaXRpYWxpemVkKCkgaXMgY2hlY2sgaWYgdGhlIGxlbmd0aCBwYXNzZWQKKyAgICAg ICAgaXMgemVyby4gSW50ZXJuYWxseSwgdGhlcmUgYXJlIG1hbnkgY2FzZXMgZm9yIHdoaWNoIHdl IGtub3cgdGhlIGNoZWNrIHdpbGwgbmV2ZXIgc3VjY2VlZC4KKworICAgICAgICBDbGFuZyBpcyB1 c3VhbGx5IHJlYWxseSBzbWFydCBmb3IgdGhvc2Uga2luZCBvZiB0aGluZ3MsIGJ1dCB0aGVyZSBh cmUgYSBmZXcgY2FzZXMgd2hlcmUKKyAgICAgICAgdGhlIGNvbmRpdGlvbiB0byBhdm9pZCByZXR1 cm5pbmcgZW1wdHkoKSBpcyBub3Qgc2ltcGx5IGEgY2hlY2sgZm9yIHRoZSBsZW5ndGguCisgICAg ICAgIFRoaXMgcGF0Y2ggYWRkcyBhbiBpbnRlcm5hbCBpbml0aWFsaXplciB0byBkZWFsIHdpdGgg dGhhdC4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwOgorICAgICAgICAoV1RG OjpTdHJpbmdJbXBsOjpjcmVhdGVVbmluaXRpYWxpemVkSW50ZXJuYWwpOgorICAgICAgICAoV1RG OjpTdHJpbmdJbXBsOjpjcmVhdGVVbmluaXRpYWxpemVkSW50ZXJuYWxOb25FbXB0eSk6CisgICAg ICAgIChXVEY6OlN0cmluZ0ltcGw6OmNyZWF0ZUludGVybmFsKTogQ3JlYXRlIGludGVybmFsIGhh cyBhIHNwZWNpYWwgY2FzZSBmb3IgbnVsbCBwb2ludGVyCisgICAgICAgIGZvciB0aGUgY2hhcmFj dGVycy4gVGhlIHRlc3QgYWxzbyBjaGVjayBsZW5ndGgsIHRoZSBzZWNvbmQgY2hlY2sgZm9yIGxl bmd0aCBjYW5ub3QgZmFpbC4KKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6Y3JlYXRlOEJpdElm UG9zc2libGUpOiBkaXR0by4KKyAgICAgICAgKFdURjo6U3RyaW5nSW1wbDo6bG93ZXIpOiAzIG9m IHRoZSBjYWxscyBjYW5ub3QgYmUgcmVhY2hlZCBmb3IgZW1wdHkgbGVuZ3RoLiBPbiBhbiBlbXB0 eSBsZW5ndGgsCisgICAgICAgIHRoZSB0ZXN0IGZvciAobm9VcHBlciAmJiAhKG9yZWQgJiB+MHg3 RikpIHdvdWxkIGhhdmUgY2F1c2VkIHRoZSBmdW5jdGlvbiB0byByZXR1cm4gInRoaXMiLgorCisg ICAgICAgIEZvciB0aGUgbGFzdCBjcmVhdGVVbmluaXRpYWxpemVkKCksIHRoZXJlIGlzIG5vIGd1 YXJhbnRlZSB0aGUgcmVhbExlbmd0aCBpcyBub3QgemVyby4KKworICAgICAgICAoV1RGOjpTdHJp bmdJbXBsOjpyZXBsYWNlKTogVGhlIGZpcnN0IHRoaW5nIHdlIGRvIGluIHJlcGxhY2UoVUNoYXIs VUNoYXIpIGlzIGNoZWNrIGlmIHRoZXJlIGlzIGFueXRoaW5nCisgICAgICAgIHRvIHJlcGxhY2Uu IFRoZSBjaGVjayBmb3IgbGVuZ3RoIHdpbGwgbmV2ZXIgc3VjY2VlZCBhcyB0aGVyZSBtdXN0IGJl IGEgY2hhcmFjdGVyIHRvIHJlcGxhY2UgYXQgdGhhdCBwb2ludC4KKyAgICAgICAgKiB3dGYvdGV4 dC9TdHJpbmdJbXBsLmg6CisKIDIwMTMtMDctMTUgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1p bkB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBhIHRocmVhZGluZyBhc3NlcnRpb24gdG8gQXRv bWljU3RyaW5nOjpyZW1vdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5n SW1wbC5jcHAgYi9Tb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuY3BwCmluZGV4IDI2MTdl ZTczZDY0Nzc1ODQ0MmQ2ZjA0ZDNjNTZmMzY5NjFlY2I4YTkuLjFjNmQzMzJiZWFmNjhhMWQ2OWY1 YjgxNjM0OTAzOTE5ZjYyZjE4NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3Ry aW5nSW1wbC5jcHAKKysrIGIvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmNwcApAQCAt MTg5LDYgKzE4OSwxMyBAQCBpbmxpbmUgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBTdHJpbmdJbXBs OjpjcmVhdGVVbmluaXRpYWxpemVkSW50ZXJuYWwodW5zaWduZWQgbAogICAgICAgICBkYXRhID0g MDsKICAgICAgICAgcmV0dXJuIGVtcHR5KCk7CiAgICAgfQorICAgIHJldHVybiBjcmVhdGVVbmlu aXRpYWxpemVkSW50ZXJuYWxOb25FbXB0eShsZW5ndGgsIGRhdGEpOworfQorCit0ZW1wbGF0ZSA8 dHlwZW5hbWUgQ2hhclR5cGU+CitpbmxpbmUgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBTdHJpbmdJ bXBsOjpjcmVhdGVVbmluaXRpYWxpemVkSW50ZXJuYWxOb25FbXB0eSh1bnNpZ25lZCBsZW5ndGgs IENoYXJUeXBlKiYgZGF0YSkKK3sKKyAgICBBU1NFUlQobGVuZ3RoKTsKIAogICAgIC8vIEFsbG9j YXRlIGEgc2luZ2xlIGJ1ZmZlciBsYXJnZSBlbm91Z2ggdG8gY29udGFpbiB0aGUgU3RyaW5nSW1w bAogICAgIC8vIHN0cnVjdCBhcyB3ZWxsIGFzIHRoZSBkYXRhIHdoaWNoIGl0IGNvbnRhaW5zLiBU aGlzIHJlbW92ZXMgb25lCkBAIC0yNTMsNyArMjYwLDcgQEAgaW5saW5lIFBhc3NSZWZQdHI8U3Ry aW5nSW1wbD4gU3RyaW5nSW1wbDo6Y3JlYXRlSW50ZXJuYWwoY29uc3QgQ2hhclR5cGUqIGNoYXJh Y3QKICAgICAgICAgcmV0dXJuIGVtcHR5KCk7CiAKICAgICBDaGFyVHlwZSogZGF0YTsKLSAgICBS ZWZQdHI8U3RyaW5nSW1wbD4gc3RyaW5nID0gY3JlYXRlVW5pbml0aWFsaXplZChsZW5ndGgsIGRh dGEpOworICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBzdHJpbmcgPSBjcmVhdGVVbmluaXRpYWxpemVk SW50ZXJuYWxOb25FbXB0eShsZW5ndGgsIGRhdGEpOwogICAgIG1lbWNweShkYXRhLCBjaGFyYWN0 ZXJzLCBsZW5ndGggKiBzaXplb2YoQ2hhclR5cGUpKTsKICAgICByZXR1cm4gc3RyaW5nLnJlbGVh c2UoKTsKIH0KQEAgLTI3NCw3ICsyODEsNyBAQCBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IFN0cmlu Z0ltcGw6OmNyZWF0ZThCaXRJZlBvc3NpYmxlKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLAogICAg ICAgICByZXR1cm4gZW1wdHkoKTsKIAogICAgIExDaGFyKiBkYXRhOwotICAgIFJlZlB0cjxTdHJp bmdJbXBsPiBzdHJpbmcgPSBjcmVhdGVVbmluaXRpYWxpemVkKGxlbmd0aCwgZGF0YSk7CisgICAg UmVmUHRyPFN0cmluZ0ltcGw+IHN0cmluZyA9IGNyZWF0ZVVuaW5pdGlhbGl6ZWRJbnRlcm5hbE5v bkVtcHR5KGxlbmd0aCwgZGF0YSk7CiAKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxlbmd0 aDsgKytpKSB7CiAgICAgICAgIGlmIChjaGFyYWN0ZXJzW2ldICYgMHhmZjAwKQpAQCAtNDA5LDcg KzQxNiw3IEBAIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gU3RyaW5nSW1wbDo6bG93ZXIoKQogICAg ICAgICBpbnQzMl90IGxlbmd0aCA9IG1fbGVuZ3RoOwogCiAgICAgICAgIExDaGFyKiBkYXRhODsK LSAgICAgICAgUmVmUHRyPFN0cmluZ0ltcGw+IG5ld0ltcGwgPSBjcmVhdGVVbmluaXRpYWxpemVk KGxlbmd0aCwgZGF0YTgpOworICAgICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gbmV3SW1wbCA9IGNy ZWF0ZVVuaW5pdGlhbGl6ZWRJbnRlcm5hbE5vbkVtcHR5KGxlbmd0aCwgZGF0YTgpOwogCiAgICAg ICAgIGlmICghKG9yZWQgJiB+MHg3RikpIHsKICAgICAgICAgICAgIGZvciAoaW50MzJfdCBpID0g MDsgaSA8IGxlbmd0aDsgKytpKQpAQCAtNDQxLDcgKzQ0OCw3IEBAIFBhc3NSZWZQdHI8U3RyaW5n SW1wbD4gU3RyaW5nSW1wbDo6bG93ZXIoKQogCiAgICAgaWYgKCEob3JlZCAmIH4weDdGKSkgewog ICAgICAgICBVQ2hhciogZGF0YTE2OwotICAgICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gbmV3SW1w bCA9IGNyZWF0ZVVuaW5pdGlhbGl6ZWQobV9sZW5ndGgsIGRhdGExNik7CisgICAgICAgIFJlZlB0 cjxTdHJpbmdJbXBsPiBuZXdJbXBsID0gY3JlYXRlVW5pbml0aWFsaXplZEludGVybmFsTm9uRW1w dHkobV9sZW5ndGgsIGRhdGExNik7CiAgICAgICAgIAogICAgICAgICBmb3IgKGludDMyX3QgaSA9 IDA7IGkgPCBsZW5ndGg7ICsraSkgewogICAgICAgICAgICAgVUNoYXIgYyA9IG1fZGF0YTE2W2ld OwpAQCAtNDUyLDcgKzQ1OSw3IEBAIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gU3RyaW5nSW1wbDo6 bG93ZXIoKQogICAgIAogICAgIC8vIERvIGEgc2xvd2VyIGltcGxlbWVudGF0aW9uIGZvciBjYXNl cyB0aGF0IGluY2x1ZGUgbm9uLUFTQ0lJIGNoYXJhY3RlcnMuCiAgICAgVUNoYXIqIGRhdGExNjsK LSAgICBSZWZQdHI8U3RyaW5nSW1wbD4gbmV3SW1wbCA9IGNyZWF0ZVVuaW5pdGlhbGl6ZWQobV9s ZW5ndGgsIGRhdGExNik7CisgICAgUmVmUHRyPFN0cmluZ0ltcGw+IG5ld0ltcGwgPSBjcmVhdGVV bmluaXRpYWxpemVkSW50ZXJuYWxOb25FbXB0eShtX2xlbmd0aCwgZGF0YTE2KTsKIAogICAgIGJv b2wgZXJyb3I7CiAgICAgaW50MzJfdCByZWFsTGVuZ3RoID0gVW5pY29kZTo6dG9Mb3dlcihkYXRh MTYsIGxlbmd0aCwgbV9kYXRhMTYsIG1fbGVuZ3RoLCAmZXJyb3IpOwpAQCAtNjM5LDcgKzY0Niw3 IEBAIHRlbXBsYXRlIDxjbGFzcyBVQ2hhclByZWRpY2F0ZT4KIGlubGluZSBQYXNzUmVmUHRyPFN0 cmluZ0ltcGw+IFN0cmluZ0ltcGw6OnN0cmlwTWF0Y2hlZENoYXJhY3RlcnMoVUNoYXJQcmVkaWNh dGUgcHJlZGljYXRlKQogewogICAgIGlmICghbV9sZW5ndGgpCi0gICAgICAgIHJldHVybiBlbXB0 eSgpOworICAgICAgICByZXR1cm4gdGhpczsKIAogICAgIHVuc2lnbmVkIHN0YXJ0ID0gMDsKICAg ICB1bnNpZ25lZCBlbmQgPSBtX2xlbmd0aCAtIDE7CkBAIC0xMzM1LDcgKzEzNDIsNyBAQCBQYXNz UmVmUHRyPFN0cmluZ0ltcGw+IFN0cmluZ0ltcGw6OnJlcGxhY2UoVUNoYXIgb2xkQywgVUNoYXIg bmV3QykKICAgICAgICAgICAgIExDaGFyIG9sZENoYXIgPSBzdGF0aWNfY2FzdDxMQ2hhcj4ob2xk Qyk7CiAgICAgICAgICAgICBMQ2hhciBuZXdDaGFyID0gc3RhdGljX2Nhc3Q8TENoYXI+KG5ld0Mp OwogCi0gICAgICAgICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gbmV3SW1wbCA9IGNyZWF0ZVVuaW5p dGlhbGl6ZWQobV9sZW5ndGgsIGRhdGEpOworICAgICAgICAgICAgUmVmUHRyPFN0cmluZ0ltcGw+ IG5ld0ltcGwgPSBjcmVhdGVVbmluaXRpYWxpemVkSW50ZXJuYWxOb25FbXB0eShtX2xlbmd0aCwg ZGF0YSk7CiAKICAgICAgICAgICAgIGZvciAoaSA9IDA7IGkgIT0gbV9sZW5ndGg7ICsraSkgewog ICAgICAgICAgICAgICAgIExDaGFyIGNoID0gbV9kYXRhOFtpXTsKQEAgLTEzNDksNyArMTM1Niw3 IEBAIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gU3RyaW5nSW1wbDo6cmVwbGFjZShVQ2hhciBvbGRD LCBVQ2hhciBuZXdDKQogICAgICAgICAvLyBUaGVyZSBpcyB0aGUgcG9zc2liaWxpdHkgd2UgbmVl ZCB0byB1cCBjb252ZXJ0IGZyb20gOCB0byAxNiBiaXQsCiAgICAgICAgIC8vIGNyZWF0ZSBhIDE2 IGJpdCBzdHJpbmcgZm9yIHRoZSByZXN1bHQuCiAgICAgICAgIFVDaGFyKiBkYXRhOwotICAgICAg ICBSZWZQdHI8U3RyaW5nSW1wbD4gbmV3SW1wbCA9IGNyZWF0ZVVuaW5pdGlhbGl6ZWQobV9sZW5n dGgsIGRhdGEpOworICAgICAgICBSZWZQdHI8U3RyaW5nSW1wbD4gbmV3SW1wbCA9IGNyZWF0ZVVu aW5pdGlhbGl6ZWRJbnRlcm5hbE5vbkVtcHR5KG1fbGVuZ3RoLCBkYXRhKTsKIAogICAgICAgICBm b3IgKGkgPSAwOyBpICE9IG1fbGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIFVDaGFyIGNoID0g bV9kYXRhOFtpXTsKQEAgLTEzNjIsNyArMTM2OSw3IEBAIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4g U3RyaW5nSW1wbDo6cmVwbGFjZShVQ2hhciBvbGRDLCBVQ2hhciBuZXdDKQogICAgIH0KIAogICAg IFVDaGFyKiBkYXRhOwotICAgIFJlZlB0cjxTdHJpbmdJbXBsPiBuZXdJbXBsID0gY3JlYXRlVW5p bml0aWFsaXplZChtX2xlbmd0aCwgZGF0YSk7CisgICAgUmVmUHRyPFN0cmluZ0ltcGw+IG5ld0lt cGwgPSBjcmVhdGVVbmluaXRpYWxpemVkSW50ZXJuYWxOb25FbXB0eShtX2xlbmd0aCwgZGF0YSk7 CiAKICAgICBmb3IgKGkgPSAwOyBpICE9IG1fbGVuZ3RoOyArK2kpIHsKICAgICAgICAgVUNoYXIg Y2ggPSBtX2RhdGExNltpXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5n SW1wbC5oIGIvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmgKaW5kZXggMGQ2YzM1OGE0 ZTIxYTI2NWE4NmFjNTdhZDdhZGU5ODRiNzkwNzM2Ny4uYjkzNzA2ZGFlMzYyYzhlNzlmMmRkMDM1 MTg4NjMwZGQ0Yzc0NDg0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJ bXBsLmgKKysrIGIvU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmgKQEAgLTc2OSw2ICs3 NjksNyBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBDaGFyVHlwZSwgY2xhc3Mg VUNoYXJQcmVkaWNhdGU+IFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gc2ltcGxpZnlNYXRjaGVkQ2hh cmFjdGVyc1RvU3BhY2UoVUNoYXJQcmVkaWNhdGUpOwogICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBD aGFyVHlwZT4gc3RhdGljIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4gY29uc3RydWN0SW50ZXJuYWwo U3RyaW5nSW1wbCosIHVuc2lnbmVkKTsKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhclR5cGU+ IHN0YXRpYyBQYXNzUmVmUHRyPFN0cmluZ0ltcGw+IGNyZWF0ZVVuaW5pdGlhbGl6ZWRJbnRlcm5h bCh1bnNpZ25lZCwgQ2hhclR5cGUqJik7CisgICAgdGVtcGxhdGUgPHR5cGVuYW1lIENoYXJUeXBl PiBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiBjcmVhdGVVbmluaXRpYWxpemVkSW50ZXJu YWxOb25FbXB0eSh1bnNpZ25lZCwgQ2hhclR5cGUqJik7CiAgICAgdGVtcGxhdGUgPHR5cGVuYW1l IENoYXJUeXBlPiBzdGF0aWMgUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiByZWFsbG9jYXRlSW50ZXJu YWwoUGFzc1JlZlB0cjxTdHJpbmdJbXBsPiwgdW5zaWduZWQsIENoYXJUeXBlKiYpOwogICAgIHRl bXBsYXRlIDx0eXBlbmFtZSBDaGFyVHlwZT4gc3RhdGljIFBhc3NSZWZQdHI8U3RyaW5nSW1wbD4g Y3JlYXRlSW50ZXJuYWwoY29uc3QgQ2hhclR5cGUqLCB1bnNpZ25lZCk7CiAgICAgV1RGX0VYUE9S VF9TVFJJTkdfQVBJIE5FVkVSX0lOTElORSBjb25zdCBVQ2hhciogZ2V0RGF0YTE2U2xvd0Nhc2Uo KSBjb25zdDsK