141571 2015-02-13 11:43:03 -0800 Add a move constructor and move assignment operator to Deque 2015-02-16 08:12:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue darin oldest_to_newest 1068987 0 andersca 2015-02-13 11:43:03 -0800 Add a move constructor and move assignment operator to Deque 1068988 1 246539 andersca 2015-02-13 11:44:00 -0800 Created attachment 246539 Patch 1068991 2 andersca 2015-02-13 11:53:01 -0800 Committed r180066: <http://trac.webkit.org/changeset/180066> 1069085 3 246539 darin 2015-02-13 19:10:09 -0800 Comment on attachment 246539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246539&action=review > Source/WTF/wtf/Deque.h:327 > template<typename T, size_t inlineCapacity> > +inline auto Deque<T, inlineCapacity>::operator=(Deque&& other) -> Deque& > +{ > + swap(other); > + return *this; > +} This isn’t right. We need to clear other after swapping, I think. 1069086 4 246539 darin 2015-02-13 19:10:37 -0800 Comment on attachment 246539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=246539&action=review > Tools/TestWebKitAPI/Tests/WTF/Deque.cpp:182 > + EXPECT_EQ(10u, deque2.size()); That doesn’t seem right. deque2’s size should be zero. 1069439 5 andersca 2015-02-16 08:12:54 -0800 (In reply to comment #3) > Comment on attachment 246539 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=246539&action=review > > > Source/WTF/wtf/Deque.h:327 > > template<typename T, size_t inlineCapacity> > > +inline auto Deque<T, inlineCapacity>::operator=(Deque&& other) -> Deque& > > +{ > > + swap(other); > > + return *this; > > +} > > This isn’t right. We need to clear other after swapping, I think. Move constructors don't have to clear out the original; they only need to leave the moved-from object in a valid (but indeterminate) state. 246539 2015-02-13 11:44:00 -0800 2015-02-13 11:47:13 -0800 Patch bug-141571-20150213114401.patch text/plain 4897 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDliNjU1NDM3ZjhmMzVjZjZkOGM3MmZm ZWQ1NGRjMzFiYzlkNDQwNTYuLmFiYWU3Y2FjMGU0N2M1ZGZkNmU4MGM0YTIyZmMzNGIwNmEzMzMy OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTUtMDItMTMgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBBZGQgYSBtb3ZlIGNvbnN0cnVjdG9yIGFuZCBt b3ZlIGFzc2lnbm1lbnQgb3BlcmF0b3IgdG8gRGVxdWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTU3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3RmL0RlcXVlLmg6CisgICAgICAgIChXVEY6Omlu bGluZUNhcGFjaXR5Pjo6RGVxdWUpOgorICAgICAgICAoV1RGOjo9KTogRGVsZXRlZC4KKworMjAx NS0wMi0xMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAg IEFkZCBhbiBpbml0aWFsaXplciBsaXN0IGNvbnN0cnVjdG9yIHRvIERlcXVlCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE1NjUKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dURi93dGYvRGVxdWUuaCBiL1NvdXJjZS9XVEYvd3RmL0RlcXVlLmgKaW5kZXgg YTYyMDQ4ZTU3YjVkOGE3MmQ0NDc5OWRiMTcxMWFiODQwNGY1NmYzZS4uOGY3YWU0ZmQwMjc5ZGRh M2ZhZWQzOTg4YjE3YjFkZTU4M2VjNGMyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvRGVx dWUuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9EZXF1ZS5oCkBAIC01MywxMSArNTMsMTQgQEAgcHVi bGljOgogCiAgICAgRGVxdWUoKTsKICAgICBEZXF1ZShzdGQ6OmluaXRpYWxpemVyX2xpc3Q8VD4p OwotICAgIERlcXVlKGNvbnN0IERlcXVlPFQsIGlubGluZUNhcGFjaXR5PiYpOwotICAgIERlcXVl JiBvcGVyYXRvcj0oY29uc3QgRGVxdWU8VCwgaW5saW5lQ2FwYWNpdHk+Jik7CisgICAgRGVxdWUo Y29uc3QgRGVxdWUmKTsKKyAgICBEZXF1ZShEZXF1ZSYmKTsKICAgICB+RGVxdWUoKTsKIAotICAg IHZvaWQgc3dhcChEZXF1ZTxULCBpbmxpbmVDYXBhY2l0eT4mKTsKKyAgICBEZXF1ZSYgb3BlcmF0 b3I9KGNvbnN0IERlcXVlJik7CisgICAgRGVxdWUmIG9wZXJhdG9yPShEZXF1ZSYmKTsKKworICAg IHZvaWQgc3dhcChEZXF1ZSYpOwogCiAgICAgc2l6ZV90IHNpemUoKSBjb25zdCB7IHJldHVybiBt X3N0YXJ0IDw9IG1fZW5kID8gbV9lbmQgLSBtX3N0YXJ0IDogbV9lbmQgKyBtX2J1ZmZlci5jYXBh Y2l0eSgpIC0gbV9zdGFydDsgfQogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1f c3RhcnQgPT0gbV9lbmQ7IH0KQEAgLTI4Miw3ICsyODUsNyBAQCBpbmxpbmUgRGVxdWU8VCwgaW5s aW5lQ2FwYWNpdHk+OjpEZXF1ZShzdGQ6OmluaXRpYWxpemVyX2xpc3Q8VD4gaW5pdGlhbGl6ZXJM aXN0KQogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+Ci1p bmxpbmUgRGVxdWU8VCwgaW5saW5lQ2FwYWNpdHk+OjpEZXF1ZShjb25zdCBEZXF1ZTxULCBpbmxp bmVDYXBhY2l0eT4mIG90aGVyKQoraW5saW5lIERlcXVlPFQsIGlubGluZUNhcGFjaXR5Pjo6RGVx dWUoY29uc3QgRGVxdWUmIG90aGVyKQogICAgIDogbV9zdGFydChvdGhlci5tX3N0YXJ0KQogICAg ICwgbV9lbmQob3RoZXIubV9lbmQpCiAgICAgLCBtX2J1ZmZlcihvdGhlci5tX2J1ZmZlci5jYXBh Y2l0eSgpKQpAQCAtMzAwLDcgKzMwMywxNCBAQCBpbmxpbmUgRGVxdWU8VCwgaW5saW5lQ2FwYWNp dHk+OjpEZXF1ZShjb25zdCBEZXF1ZTxULCBpbmxpbmVDYXBhY2l0eT4mIG90aGVyKQogfQogCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+Ci1pbmxpbmUgRGVxdWU8 VCwgaW5saW5lQ2FwYWNpdHk+JiBEZXF1ZTxULCBpbmxpbmVDYXBhY2l0eT46Om9wZXJhdG9yPShj b25zdCBEZXF1ZTxULCBpbmxpbmVDYXBhY2l0eT4mIG90aGVyKQoraW5saW5lIERlcXVlPFQsIGlu bGluZUNhcGFjaXR5Pjo6RGVxdWUoRGVxdWUmJiBvdGhlcikKKyAgICA6IERlcXVlKCkKK3sKKyAg ICBzd2FwKG90aGVyKTsKK30KKwordGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNh cGFjaXR5PgoraW5saW5lIGF1dG8gRGVxdWU8VCwgaW5saW5lQ2FwYWNpdHk+OjpvcGVyYXRvcj0o Y29uc3QgRGVxdWUmIG90aGVyKSAtPiBEZXF1ZSYKIHsKICAgICAvLyBGSVhNRTogVGhpcyBpcyBp bmVmZmljaWVudCBpZiB3ZSdyZSB1c2luZyBhbiBpbmxpbmUgYnVmZmVyIGFuZCBUIGlzCiAgICAg Ly8gZXhwZW5zaXZlIHRvIGNvcHkgc2luY2UgaXQgd2lsbCBjb3B5IHRoZSBidWZmZXIgdHdpY2Ug aW5zdGVhZCBvZiBvbmNlLgpAQCAtMzEwLDYgKzMyMCwxMyBAQCBpbmxpbmUgRGVxdWU8VCwgaW5s aW5lQ2FwYWNpdHk+JiBEZXF1ZTxULCBpbmxpbmVDYXBhY2l0eT46Om9wZXJhdG9yPShjb25zdCBE ZXF1ZQogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+Citp bmxpbmUgYXV0byBEZXF1ZTxULCBpbmxpbmVDYXBhY2l0eT46Om9wZXJhdG9yPShEZXF1ZSYmIG90 aGVyKSAtPiBEZXF1ZSYKK3sKKyAgICBzd2FwKG90aGVyKTsKKyAgICByZXR1cm4gKnRoaXM7Cit9 CisKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eT4KIGlubGluZSB2 b2lkIERlcXVlPFQsIGlubGluZUNhcGFjaXR5Pjo6ZGVzdHJveUFsbCgpCiB7CiAgICAgaWYgKG1f c3RhcnQgPD0gbV9lbmQpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFu Z2VMb2cKaW5kZXggOTJmZjY5M2U1NGNiN2MxNmEyOGM4NDU2ZjM2YmE2YjAzMDZmODljNS4uYWVm OWJlZDAzMjI2NzI2ZDA2ZGQ0OGVjZGMzMGFkNWZhYmEzYTZiNyAxMDA2NDQKLS0tIGEvVG9vbHMv Q2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDE1LTAy LTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRk IGEgbW92ZSBjb25zdHJ1Y3RvciBhbmQgbW92ZSBhc3NpZ25tZW50IG9wZXJhdG9yIHRvIERlcXVl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE1NzEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV1RGL0RlcXVlLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRF U1QpOgorCisyMDE1LTAyLTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CisKICAgICAgICAgQWRkIGFuIGluaXRpYWxpemVyIGxpc3QgY29uc3RydWN0b3IgdG8gRGVxdWUK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTU2NQog CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9EZXF1ZS5jcHAgYi9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9EZXF1ZS5jcHAKaW5kZXggODc0ZjVjNDVhZGFm MmUxNGYwNmU2ZjFiMTYxYzZjOTIzMDRkY2QyZi4uZGI5YjBhYzEzNTRkNTI1MDdjNjE0ZTgwMzQx YzA0ZDg1MGExOTZkMyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYv RGVxdWUuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0RlcXVlLmNwcApA QCAtMTQ0LDQgKzE0NCw0OCBAQCBURVNUKFdURl9EZXF1ZSwgTW92ZU9ubHkpCiAgICAgRVhQRUNU X0VRKDFVLCBsYXN0LnZhbHVlKCkpOwogfQogCitURVNUKFdURl9EZXF1ZSwgTW92ZUNvbnN0cnVj dG9yKQoreworICAgIERlcXVlPE1vdmVPbmx5LCA0PiBkZXF1ZTsKKworICAgIGZvciAodW5zaWdu ZWQgaSA9IDA7IGkgPCAxMDsgKytpKQorICAgICAgICBkZXF1ZS5hcHBlbmQoTW92ZU9ubHkoaSkp OworCisgICAgRVhQRUNUX0VRKDEwdSwgZGVxdWUuc2l6ZSgpKTsKKworICAgIERlcXVlPE1vdmVP bmx5LCA0PiBkZXF1ZTIgPSBXVEY6Om1vdmUoZGVxdWUpOworCisgICAgRVhQRUNUX0VRKDEwdSwg ZGVxdWUyLnNpemUoKSk7CisKKyAgICB1bnNpZ25lZCBpID0gMDsKKyAgICBmb3IgKGF1dG8mIGVs ZW1lbnQgOiBkZXF1ZTIpIHsKKyAgICAgICAgRVhQRUNUX0VRKGksIGVsZW1lbnQudmFsdWUoKSk7 CisgICAgICAgICsraTsKKyAgICB9Cit9CisKK1RFU1QoV1RGX0RlcXVlLCBNb3ZlQXNzaWdubWVu dE9wZXJhdG9yKQoreworICAgIERlcXVlPE1vdmVPbmx5LCA0PiBkZXF1ZTE7CisKKyAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgMTA7ICsraSkKKyAgICAgICAgZGVxdWUxLmFwcGVuZChNb3Zl T25seShpKSk7CisKKyAgICBFWFBFQ1RfRVEoMTB1LCBkZXF1ZTEuc2l6ZSgpKTsKKworICAgIERl cXVlPE1vdmVPbmx5LCA0PiBkZXF1ZTI7CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IDEw OyArK2kpCisgICAgICAgIGRlcXVlMi5hcHBlbmQoTW92ZU9ubHkoaSAqIDIpKTsKKworICAgIGRl cXVlMSA9IFdURjo6bW92ZShkZXF1ZTIpOworCisgICAgRVhQRUNUX0VRKDEwdSwgZGVxdWUyLnNp emUoKSk7CisKKyAgICB1bnNpZ25lZCBpID0gMDsKKyAgICBmb3IgKGF1dG8mIGVsZW1lbnQgOiBk ZXF1ZTEpIHsKKyAgICAgICAgRVhQRUNUX0VRKGkgKiAyLCBlbGVtZW50LnZhbHVlKCkpOworICAg ICAgICArK2k7CisgICAgfQorfQorCiB9IC8vIG5hbWVzcGFjZSBUZXN0V2ViS2l0QVBJCg==