171861 2017-05-09 08:50:47 -0700 Force StaticStringImpl constructor to use the constexpr versions of StringImplShape constructors. 2017-05-09 12:05:23 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 171800 1 mark.lam mark.lam benjamin buildbot cdumez cmarcelo dbates fujii pvollan saam ysuzuki oldest_to_newest 1306394 0 mark.lam 2017-05-09 08:50:47 -0700 This is strictly necessary for correctness of the StaticStringImpl implementation. 1306405 1 309503 mark.lam 2017-05-09 09:12:04 -0700 Created attachment 309503 proposed patch. 1306406 2 309503 ysuzuki 2017-05-09 09:15:21 -0700 Comment on attachment 309503 proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=309503&action=review r=me with nits. > Source/WTF/wtf/text/StringImpl.h:150 > + constexpr StringImplShape(unsigned refCount, unsigned length, const char (&characters)[charactersCount], unsigned hashAndFlags, int) I like to use enum for these taggings like, CreateSymbolTag in StringImpl.h. > Source/WTF/wtf/text/StringImpl.h:158 > + constexpr StringImplShape(unsigned refCount, unsigned length, const char16_t (&characters)[charactersCount], unsigned hashAndFlags, int) Ditto. 1306407 3 mark.lam 2017-05-09 09:16:31 -0700 (In reply to Yusuke Suzuki from comment #2) > Comment on attachment 309503 [details] > proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=309503&action=review > > r=me with nits. > > > Source/WTF/wtf/text/StringImpl.h:150 > > + constexpr StringImplShape(unsigned refCount, unsigned length, const char (&characters)[charactersCount], unsigned hashAndFlags, int) > > I like to use enum for these taggings like, CreateSymbolTag in StringImpl.h. Good idea. Will do. 1306412 4 309505 mark.lam 2017-05-09 09:25:12 -0700 Created attachment 309505 patch for landing. 1306435 5 mark.lam 2017-05-09 10:12:09 -0700 Thanks for the review. Landed in r216512: <http://trac.webkit.org/r216512>. 1306488 6 309505 saam 2017-05-09 12:05:23 -0700 Comment on attachment 309505 patch for landing. View in context: https://bugs.webkit.org/attachment.cgi?id=309505&action=review > Source/WTF/wtf/text/StringImpl.h:160 > + constexpr StringImplShape(unsigned refCount, unsigned length, const char16_t (&characters)[charactersCount], unsigned hashAndFlags, ConstructWithConstExprTag) Style nit: I feel like we usually put these tags as the first argument, not the last. 309503 2017-05-09 09:12:04 -0700 2017-05-09 09:25:12 -0700 proposed patch. bug-171861.patch text/plain 3413 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMTY1MDcpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA1LTA5ICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBGb3JjZSBTdGF0aWNTdHJpbmdJbXBsIGNvbnN0cnVjdG9y IHRvIHVzZSB0aGUgY29uc3RleHByIHZlcnNpb25zIG9mIFN0cmluZ0ltcGxTaGFwZSBjb25zdHJ1 Y3RvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzE4NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIHN0cmljdGx5IG5lY2Vzc2FyeSBmb3IgY29ycmVjdG5lc3Mgb2YgdGhlIFN0YXRpY1N0 cmluZ0ltcGwgaW1wbGVtZW50YXRpb24uCisgICAgICAgIFdlIGZvcmNlIHRoZSBjb25zdHJ1Y3Rv ciBzZWxlY3Rpb24gYnkgYWRkaW5nIGFuIGV4dHJhIGR1bW15IGFyZ3VtZW50IHRvIHRoZQorICAg ICAgICBjb25zdGV4cHIgdmVyc2lvbnMgb2YgdGhlIFN0cmluZ0ltcGxTaGFwZSBjb25zdHJ1Y3Rv cnMgdG8gZGlzYW1iaWd1YXRlIHRoZW0gZnJvbQorICAgICAgICB0aGUgbm9uLWNvbnN0ZXhwciB2 ZXJzaW9ucy4KKworICAgICAgICAqIHd0Zi90ZXh0L1N0cmluZ0ltcGwuaDoKKyAgICAgICAgKFdU Rjo6U3RyaW5nSW1wbFNoYXBlOjpTdHJpbmdJbXBsU2hhcGUpOgorICAgICAgICAoV1RGOjpTdHJp bmdJbXBsOjpTdGF0aWNTdHJpbmdJbXBsOjpTdGF0aWNTdHJpbmdJbXBsKToKKwogMjAxNy0wNS0w OSAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgVXBzdHJl YW0gdGhlIFdQRSBwb3J0CkluZGV4OiBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAkocmV2aXNpb24g MjE2NTA3KQorKysgU291cmNlL1dURi93dGYvdGV4dC9TdHJpbmdJbXBsLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE0Nyw3ICsxNDcsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgeyB9CiAKICAgICB0ZW1wbGF0 ZTx1bnNpZ25lZCBjaGFyYWN0ZXJzQ291bnQ+Ci0gICAgY29uc3RleHByIFN0cmluZ0ltcGxTaGFw ZSh1bnNpZ25lZCByZWZDb3VudCwgdW5zaWduZWQgbGVuZ3RoLCBjb25zdCBjaGFyICgmY2hhcmFj dGVycylbY2hhcmFjdGVyc0NvdW50XSwgdW5zaWduZWQgaGFzaEFuZEZsYWdzKQorICAgIGNvbnN0 ZXhwciBTdHJpbmdJbXBsU2hhcGUodW5zaWduZWQgcmVmQ291bnQsIHVuc2lnbmVkIGxlbmd0aCwg Y29uc3QgY2hhciAoJmNoYXJhY3RlcnMpW2NoYXJhY3RlcnNDb3VudF0sIHVuc2lnbmVkIGhhc2hB bmRGbGFncywgaW50KQogICAgICAgICA6IG1fcmVmQ291bnQocmVmQ291bnQpCiAgICAgICAgICwg bV9sZW5ndGgobGVuZ3RoKQogICAgICAgICAsIG1fZGF0YTgocmVpbnRlcnByZXRfY2FzdDxjb25z dCBMQ2hhcio+KGNoYXJhY3RlcnMpKQpAQCAtMTU1LDcgKzE1NSw3IEBAIHByb3RlY3RlZDoKICAg ICB7IH0KICAgICAKICAgICB0ZW1wbGF0ZTx1bnNpZ25lZCBjaGFyYWN0ZXJzQ291bnQ+Ci0gICAg Y29uc3RleHByIFN0cmluZ0ltcGxTaGFwZSh1bnNpZ25lZCByZWZDb3VudCwgdW5zaWduZWQgbGVu Z3RoLCBjb25zdCBjaGFyMTZfdCAoJmNoYXJhY3RlcnMpW2NoYXJhY3RlcnNDb3VudF0sIHVuc2ln bmVkIGhhc2hBbmRGbGFncykKKyAgICBjb25zdGV4cHIgU3RyaW5nSW1wbFNoYXBlKHVuc2lnbmVk IHJlZkNvdW50LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IGNoYXIxNl90ICgmY2hhcmFjdGVycylb Y2hhcmFjdGVyc0NvdW50XSwgdW5zaWduZWQgaGFzaEFuZEZsYWdzLCBpbnQpCiAgICAgICAgIDog bV9yZWZDb3VudChyZWZDb3VudCkKICAgICAgICAgLCBtX2xlbmd0aChsZW5ndGgpCiAgICAgICAg ICwgbV9kYXRhMTYocmVpbnRlcnByZXRfY2FzdDxjb25zdCBVQ2hhcio+KGNoYXJhY3RlcnMpKQpA QCAtNTkzLDE0ICs1OTMsMTQgQEAgcHVibGljOgogICAgICAgICB0ZW1wbGF0ZTx1bnNpZ25lZCBj aGFyYWN0ZXJzQ291bnQ+CiAgICAgICAgIGNvbnN0ZXhwciBTdGF0aWNTdHJpbmdJbXBsKGNvbnN0 IGNoYXIgKCZjaGFyYWN0ZXJzKVtjaGFyYWN0ZXJzQ291bnRdLCBTdHJpbmdLaW5kIHN0cmluZ0tp bmQgPSBTdHJpbmdOb3JtYWwpCiAgICAgICAgICAgICA6IFN0cmluZ0ltcGxTaGFwZShzX3JlZkNv dW50RmxhZ0lzU3RhdGljU3RyaW5nLCBjaGFyYWN0ZXJzQ291bnQgLSAxLCBjaGFyYWN0ZXJzLAot ICAgICAgICAgICAgICAgIHNfaGFzaEZsYWc4Qml0QnVmZmVyIHwgc19oYXNoRmxhZ0RpZFJlcG9y dENvc3QgfCBzdHJpbmdLaW5kIHwgQnVmZmVySW50ZXJuYWwgfCAoU3RyaW5nSGFzaGVyOjpjb21w dXRlTGl0ZXJhbEhhc2hBbmRNYXNrVG9wOEJpdHMoY2hhcmFjdGVycykgPDwgc19mbGFnQ291bnQp KQorICAgICAgICAgICAgICAgIHNfaGFzaEZsYWc4Qml0QnVmZmVyIHwgc19oYXNoRmxhZ0RpZFJl cG9ydENvc3QgfCBzdHJpbmdLaW5kIHwgQnVmZmVySW50ZXJuYWwgfCAoU3RyaW5nSGFzaGVyOjpj b21wdXRlTGl0ZXJhbEhhc2hBbmRNYXNrVG9wOEJpdHMoY2hhcmFjdGVycykgPDwgc19mbGFnQ291 bnQpLCAwKQogICAgICAgICB7CiAgICAgICAgIH0KIAogICAgICAgICB0ZW1wbGF0ZTx1bnNpZ25l ZCBjaGFyYWN0ZXJzQ291bnQ+CiAgICAgICAgIGNvbnN0ZXhwciBTdGF0aWNTdHJpbmdJbXBsKGNv bnN0IGNoYXIxNl90ICgmY2hhcmFjdGVycylbY2hhcmFjdGVyc0NvdW50XSwgU3RyaW5nS2luZCBz dHJpbmdLaW5kID0gU3RyaW5nTm9ybWFsKQogICAgICAgICAgICAgOiBTdHJpbmdJbXBsU2hhcGUo c19yZWZDb3VudEZsYWdJc1N0YXRpY1N0cmluZywgY2hhcmFjdGVyc0NvdW50IC0gMSwgY2hhcmFj dGVycywKLSAgICAgICAgICAgICAgICBzX2hhc2hGbGFnRGlkUmVwb3J0Q29zdCB8IHN0cmluZ0tp bmQgfCBCdWZmZXJJbnRlcm5hbCB8IChTdHJpbmdIYXNoZXI6OmNvbXB1dGVMaXRlcmFsSGFzaEFu ZE1hc2tUb3A4Qml0cyhjaGFyYWN0ZXJzKSA8PCBzX2ZsYWdDb3VudCkpCisgICAgICAgICAgICAg ICAgc19oYXNoRmxhZ0RpZFJlcG9ydENvc3QgfCBzdHJpbmdLaW5kIHwgQnVmZmVySW50ZXJuYWwg fCAoU3RyaW5nSGFzaGVyOjpjb21wdXRlTGl0ZXJhbEhhc2hBbmRNYXNrVG9wOEJpdHMoY2hhcmFj dGVycykgPDwgc19mbGFnQ291bnQpLCAwKQogICAgICAgICB7CiAgICAgICAgIH0KIAo= 309505 2017-05-09 09:25:12 -0700 2017-05-09 09:25:12 -0700 patch for landing. bug-171861.patch text/plain 3609 mark.lam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMTY1MDcpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE3LTA1LTA5ICBNYXJrIExhbSAgPG1hcmsubGFt QGFwcGxlLmNvbT4KKworICAgICAgICBGb3JjZSBTdGF0aWNTdHJpbmdJbXBsIGNvbnN0cnVjdG9y IHRvIHVzZSB0aGUgY29uc3RleHByIHZlcnNpb25zIG9mIFN0cmluZ0ltcGxTaGFwZSBjb25zdHJ1 Y3RvcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzE4NjEKKworICAgICAgICBSZXZpZXdlZCBieSBZdXN1a2UgU3V6dWtpLgorCisgICAgICAgIFRo aXMgaXMgc3RyaWN0bHkgbmVjZXNzYXJ5IGZvciBjb3JyZWN0bmVzcyBvZiB0aGUgU3RhdGljU3Ry aW5nSW1wbCBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgV2UgZm9yY2UgdGhlIGNvbnN0cnVjdG9y IHNlbGVjdGlvbiBieSBhZGRpbmcgYW4gZXh0cmEgZHVtbXkgYXJndW1lbnQgdG8gdGhlCisgICAg ICAgIGNvbnN0ZXhwciB2ZXJzaW9ucyBvZiB0aGUgU3RyaW5nSW1wbFNoYXBlIGNvbnN0cnVjdG9y cyB0byBkaXNhbWJpZ3VhdGUgdGhlbSBmcm9tCisgICAgICAgIHRoZSBub24tY29uc3RleHByIHZl cnNpb25zLgorCisgICAgICAgICogd3RmL3RleHQvU3RyaW5nSW1wbC5oOgorICAgICAgICAoV1RG OjpTdHJpbmdJbXBsU2hhcGU6OlN0cmluZ0ltcGxTaGFwZSk6CisgICAgICAgIChXVEY6OlN0cmlu Z0ltcGw6OlN0YXRpY1N0cmluZ0ltcGw6OlN0YXRpY1N0cmluZ0ltcGwpOgorCiAyMDE3LTA1LTA5 ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBVcHN0cmVh bSB0aGUgV1BFIHBvcnQKSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3RleHQvU3RyaW5nSW1wbC5oCShyZXZpc2lvbiAy MTY1MDcpCisrKyBTb3VyY2UvV1RGL3d0Zi90ZXh0L1N0cmluZ0ltcGwuaAkod29ya2luZyBjb3B5 KQpAQCAtMTQ2LDggKzE0NiwxMCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgICwgbV9oYXNoQW5kRmxh Z3MoaGFzaEFuZEZsYWdzKQogICAgIHsgfQogCisgICAgZW51bSBDb25zdHJ1Y3RXaXRoQ29uc3RF eHByVGFnIHsgQ29uc3RydWN0V2l0aENvbnN0RXhwciB9OworICAgIAogICAgIHRlbXBsYXRlPHVu c2lnbmVkIGNoYXJhY3RlcnNDb3VudD4KLSAgICBjb25zdGV4cHIgU3RyaW5nSW1wbFNoYXBlKHVu c2lnbmVkIHJlZkNvdW50LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IGNoYXIgKCZjaGFyYWN0ZXJz KVtjaGFyYWN0ZXJzQ291bnRdLCB1bnNpZ25lZCBoYXNoQW5kRmxhZ3MpCisgICAgY29uc3RleHBy IFN0cmluZ0ltcGxTaGFwZSh1bnNpZ25lZCByZWZDb3VudCwgdW5zaWduZWQgbGVuZ3RoLCBjb25z dCBjaGFyICgmY2hhcmFjdGVycylbY2hhcmFjdGVyc0NvdW50XSwgdW5zaWduZWQgaGFzaEFuZEZs YWdzLCBDb25zdHJ1Y3RXaXRoQ29uc3RFeHByVGFnKQogICAgICAgICA6IG1fcmVmQ291bnQocmVm Q291bnQpCiAgICAgICAgICwgbV9sZW5ndGgobGVuZ3RoKQogICAgICAgICAsIG1fZGF0YTgocmVp bnRlcnByZXRfY2FzdDxjb25zdCBMQ2hhcio+KGNoYXJhY3RlcnMpKQpAQCAtMTU1LDcgKzE1Nyw3 IEBAIHByb3RlY3RlZDoKICAgICB7IH0KICAgICAKICAgICB0ZW1wbGF0ZTx1bnNpZ25lZCBjaGFy YWN0ZXJzQ291bnQ+Ci0gICAgY29uc3RleHByIFN0cmluZ0ltcGxTaGFwZSh1bnNpZ25lZCByZWZD b3VudCwgdW5zaWduZWQgbGVuZ3RoLCBjb25zdCBjaGFyMTZfdCAoJmNoYXJhY3RlcnMpW2NoYXJh Y3RlcnNDb3VudF0sIHVuc2lnbmVkIGhhc2hBbmRGbGFncykKKyAgICBjb25zdGV4cHIgU3RyaW5n SW1wbFNoYXBlKHVuc2lnbmVkIHJlZkNvdW50LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IGNoYXIx Nl90ICgmY2hhcmFjdGVycylbY2hhcmFjdGVyc0NvdW50XSwgdW5zaWduZWQgaGFzaEFuZEZsYWdz LCBDb25zdHJ1Y3RXaXRoQ29uc3RFeHByVGFnKQogICAgICAgICA6IG1fcmVmQ291bnQocmVmQ291 bnQpCiAgICAgICAgICwgbV9sZW5ndGgobGVuZ3RoKQogICAgICAgICAsIG1fZGF0YTE2KHJlaW50 ZXJwcmV0X2Nhc3Q8Y29uc3QgVUNoYXIqPihjaGFyYWN0ZXJzKSkKQEAgLTU5MywxNCArNTk1LDE0 IEBAIHB1YmxpYzoKICAgICAgICAgdGVtcGxhdGU8dW5zaWduZWQgY2hhcmFjdGVyc0NvdW50Pgog ICAgICAgICBjb25zdGV4cHIgU3RhdGljU3RyaW5nSW1wbChjb25zdCBjaGFyICgmY2hhcmFjdGVy cylbY2hhcmFjdGVyc0NvdW50XSwgU3RyaW5nS2luZCBzdHJpbmdLaW5kID0gU3RyaW5nTm9ybWFs KQogICAgICAgICAgICAgOiBTdHJpbmdJbXBsU2hhcGUoc19yZWZDb3VudEZsYWdJc1N0YXRpY1N0 cmluZywgY2hhcmFjdGVyc0NvdW50IC0gMSwgY2hhcmFjdGVycywKLSAgICAgICAgICAgICAgICBz X2hhc2hGbGFnOEJpdEJ1ZmZlciB8IHNfaGFzaEZsYWdEaWRSZXBvcnRDb3N0IHwgc3RyaW5nS2lu ZCB8IEJ1ZmZlckludGVybmFsIHwgKFN0cmluZ0hhc2hlcjo6Y29tcHV0ZUxpdGVyYWxIYXNoQW5k TWFza1RvcDhCaXRzKGNoYXJhY3RlcnMpIDw8IHNfZmxhZ0NvdW50KSkKKyAgICAgICAgICAgICAg ICBzX2hhc2hGbGFnOEJpdEJ1ZmZlciB8IHNfaGFzaEZsYWdEaWRSZXBvcnRDb3N0IHwgc3RyaW5n S2luZCB8IEJ1ZmZlckludGVybmFsIHwgKFN0cmluZ0hhc2hlcjo6Y29tcHV0ZUxpdGVyYWxIYXNo QW5kTWFza1RvcDhCaXRzKGNoYXJhY3RlcnMpIDw8IHNfZmxhZ0NvdW50KSwgQ29uc3RydWN0V2l0 aENvbnN0RXhwcikKICAgICAgICAgewogICAgICAgICB9CiAKICAgICAgICAgdGVtcGxhdGU8dW5z aWduZWQgY2hhcmFjdGVyc0NvdW50PgogICAgICAgICBjb25zdGV4cHIgU3RhdGljU3RyaW5nSW1w bChjb25zdCBjaGFyMTZfdCAoJmNoYXJhY3RlcnMpW2NoYXJhY3RlcnNDb3VudF0sIFN0cmluZ0tp bmQgc3RyaW5nS2luZCA9IFN0cmluZ05vcm1hbCkKICAgICAgICAgICAgIDogU3RyaW5nSW1wbFNo YXBlKHNfcmVmQ291bnRGbGFnSXNTdGF0aWNTdHJpbmcsIGNoYXJhY3RlcnNDb3VudCAtIDEsIGNo YXJhY3RlcnMsCi0gICAgICAgICAgICAgICAgc19oYXNoRmxhZ0RpZFJlcG9ydENvc3QgfCBzdHJp bmdLaW5kIHwgQnVmZmVySW50ZXJuYWwgfCAoU3RyaW5nSGFzaGVyOjpjb21wdXRlTGl0ZXJhbEhh c2hBbmRNYXNrVG9wOEJpdHMoY2hhcmFjdGVycykgPDwgc19mbGFnQ291bnQpKQorICAgICAgICAg ICAgICAgIHNfaGFzaEZsYWdEaWRSZXBvcnRDb3N0IHwgc3RyaW5nS2luZCB8IEJ1ZmZlckludGVy bmFsIHwgKFN0cmluZ0hhc2hlcjo6Y29tcHV0ZUxpdGVyYWxIYXNoQW5kTWFza1RvcDhCaXRzKGNo YXJhY3RlcnMpIDw8IHNfZmxhZ0NvdW50KSwgQ29uc3RydWN0V2l0aENvbnN0RXhwcikKICAgICAg ICAgewogICAgICAgICB9CiAK