From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 38666 invoked by alias); 25 Sep 2015 09:38:06 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 38642 invoked by uid 89); 25 Sep 2015 09:38:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-vk0-f43.google.com Received: from mail-vk0-f43.google.com (HELO mail-vk0-f43.google.com) (209.85.213.43) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Fri, 25 Sep 2015 09:38:04 +0000 Received: by vkao3 with SMTP id o3so52762119vka.2; Fri, 25 Sep 2015 02:38:01 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.31.58.142 with SMTP id h136mr2401052vka.58.1443173881643; Fri, 25 Sep 2015 02:38:01 -0700 (PDT) Received: by 10.103.37.195 with HTTP; Fri, 25 Sep 2015 02:38:01 -0700 (PDT) Date: Fri, 25 Sep 2015 10:15:00 -0000 Message-ID: Subject: [v3 PATCH] Avoid creating dangling references in case of nested tuples for tuple constructors that construct from other tuples. From: Ville Voutilainen To: "gcc-patches@gcc.gnu.org" , libstdc++@gcc.gnu.org Content-Type: multipart/mixed; boundary=001a11430fdc909f1505208f1a30 X-SW-Source: 2015-09/txt/msg01922.txt.bz2 --001a11430fdc909f1505208f1a30 Content-Type: text/plain; charset=UTF-8 Content-length: 483 Tested on Linux-PPC64. 2015-09-25 Ville Voutilainen Avoid creating dangling references in case of nested tuples for tuple constructors that construct from other tuples. * include/std/tuple (_TC::_NonNestedTuple): New. * include/std/tuple (tuple::_TNTC): New. * include/std/tuple (tuple(const tuple<_UElements...>&), tuple(tuple<_UElements...>&&): Use _TNTC. * testsuite/20_util/tuple/cons/nested_tuple_construct.cc: New. --001a11430fdc909f1505208f1a30 Content-Type: text/plain; charset=US-ASCII; name="nested-tuple-temp.diff" Content-Disposition: attachment; filename="nested-tuple-temp.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iezgfc1g0 Content-length: 7296 ZGlmZiAtLWdpdCBhL2xpYnN0ZGMrKy12My9pbmNsdWRlL3N0ZC90dXBsZSBi L2xpYnN0ZGMrKy12My9pbmNsdWRlL3N0ZC90dXBsZQppbmRleCA1OWI5OTJh Li43NTFkN2ViIDEwMDY0NAotLS0gYS9saWJzdGRjKystdjMvaW5jbHVkZS9z dGQvdHVwbGUKKysrIGIvbGlic3RkYysrLXYzL2luY2x1ZGUvc3RkL3R1cGxl CkBAIC00ODYsNiArNDg2LDE0IEBAIF9HTElCQ1hYX0JFR0lOX05BTUVTUEFD RV9WRVJTSU9OCiAgICAgewogICAgICAgcmV0dXJuIF9fYW5kXzxpc19jb252 ZXJ0aWJsZTxfVUVsZW1lbnRzJiYsIF9FbGVtZW50cz4uLi4+Ojp2YWx1ZTsK ICAgICB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBfU3JjVHVwbGU+Cisg ICAgc3RhdGljIGNvbnN0ZXhwciBib29sIF9Ob25OZXN0ZWRUdXBsZSgpCisg ICAgeworICAgICAgcmV0dXJuICBfX2FuZF88X19ub3RfPGlzX2NvbnZlcnRp YmxlPF9TcmNUdXBsZSwgX0VsZW1lbnRzLi4uPj4sCisgICAgICAgICAgICAg ICAgICAgICBfX25vdF88aXNfY29uc3RydWN0aWJsZTxfRWxlbWVudHMuLi4s IF9TcmNUdXBsZT4+CisgICAgICAgICAgICAgID46OnZhbHVlOworICAgIH0K ICAgfTsKIAogICB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBfRWxlbWVudHM+CkBA IC01MTQsNiArNTIyLDEyIEBAIF9HTElCQ1hYX0JFR0lOX05BTUVTUEFDRV9W RVJTSU9OCiAgICAgewogICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KKwor ICAgIHRlbXBsYXRlPHR5cGVuYW1lLi4uIF9VRWxlbWVudHM+CisgICAgc3Rh dGljIGNvbnN0ZXhwciBib29sIF9Ob25OZXN0ZWRUdXBsZSgpCisgICAgewor ICAgICAgcmV0dXJuIHRydWU7CisgICAgfQogICB9OwogCiAgIC8vLyBQcmlt YXJ5IGNsYXNzIHRlbXBsYXRlLCB0dXBsZQpAQCAtNTk5LDQwICs2MTMsNTQg QEAgX0dMSUJDWFhfQkVHSU5fTkFNRVNQQUNFX1ZFUlNJT04KIAogICAgICAg Y29uc3RleHByIHR1cGxlKHR1cGxlJiYpID0gZGVmYXVsdDsgCiAKLSAgICAg IHRlbXBsYXRlPHR5cGVuYW1lLi4uIF9VRWxlbWVudHMsIHR5cGVuYW1lCisg ICAgICAvLyBTaG9ydGN1dCBmb3IgdGhlIGNhc2VzIHdoZXJlIGNvbnN0cnVj dG9ycyB0YWtpbmcgdHVwbGVzCisgICAgICAvLyBtdXN0IGF2b2lkIGNyZWF0 aW5nIHRlbXBvcmFyaWVzLgorICAgICAgdGVtcGxhdGU8dHlwZW5hbWUgX0R1 bW15PiB1c2luZyBfVE5UQyA9CisgICAgICAgIF9UQzxpc19zYW1lPF9EdW1t eSwgdm9pZD46OnZhbHVlICYmIHNpemVvZi4uLihfRWxlbWVudHMpID09IDEs CisgICAgICAgICAgICBfRWxlbWVudHMuLi4+OworCisgICAgICB0ZW1wbGF0 ZTx0eXBlbmFtZS4uLiBfVUVsZW1lbnRzLCB0eXBlbmFtZSBfRHVtbXkgPSB2 b2lkLCB0eXBlbmFtZQogICAgICAgICBlbmFibGVfaWY8X1RNQzxfVUVsZW1l bnRzLi4uPjo6dGVtcGxhdGUKICAgICAgICAgICAgICAgICAgICAgX0NvbnN0 cnVjdGlibGVUdXBsZTxfVUVsZW1lbnRzLi4uPigpCiAgICAgICAgICAgICAg ICAgICAmJiBfVE1DPF9VRWxlbWVudHMuLi4+Ojp0ZW1wbGF0ZQotICAgICAg ICAgICAgICAgICAgICBfSW1wbGljaXRseUNvbnZlcnRpYmxlVHVwbGU8X1VF bGVtZW50cy4uLj4oKSwKKyAgICAgICAgICAgICAgICAgICAgX0ltcGxpY2l0 bHlDb252ZXJ0aWJsZVR1cGxlPF9VRWxlbWVudHMuLi4+KCkKKyAgICAgICAg ICAgICAgICAgICYmIF9UTlRDPF9EdW1teT46OnRlbXBsYXRlCisgICAgICAg ICAgICAgICAgICAgIF9Ob25OZXN0ZWRUdXBsZTxjb25zdCB0dXBsZTxfVUVs ZW1lbnRzLi4uPiY+KCksCiAgICAgICAgIGJvb2w+Ojp0eXBlPXRydWU+CiAg ICAgICAgIGNvbnN0ZXhwciB0dXBsZShjb25zdCB0dXBsZTxfVUVsZW1lbnRz Li4uPiYgX19pbikKICAgICAgICAgOiBfSW5oZXJpdGVkKHN0YXRpY19jYXN0 PGNvbnN0IF9UdXBsZV9pbXBsPDAsIF9VRWxlbWVudHMuLi4+Jj4oX19pbikp CiAgICAgICAgIHsgfQogCi0gICAgICB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBf VUVsZW1lbnRzLCB0eXBlbmFtZQorICAgICAgdGVtcGxhdGU8dHlwZW5hbWUu Li4gX1VFbGVtZW50cywgdHlwZW5hbWUgX0R1bW15ID0gdm9pZCwgdHlwZW5h bWUKICAgICAgICAgZW5hYmxlX2lmPF9UTUM8X1VFbGVtZW50cy4uLj46OnRl bXBsYXRlCiAgICAgICAgICAgICAgICAgICAgIF9Db25zdHJ1Y3RpYmxlVHVw bGU8X1VFbGVtZW50cy4uLj4oKQogICAgICAgICAgICAgICAgICAgJiYgIV9U TUM8X1VFbGVtZW50cy4uLj46OnRlbXBsYXRlCi0gICAgICAgICAgICAgICAg ICAgIF9JbXBsaWNpdGx5Q29udmVydGlibGVUdXBsZTxfVUVsZW1lbnRzLi4u PigpLAorICAgICAgICAgICAgICAgICAgICBfSW1wbGljaXRseUNvbnZlcnRp YmxlVHVwbGU8X1VFbGVtZW50cy4uLj4oKQorICAgICAgICAgICAgICAgICAg JiYgX1ROVEM8X0R1bW15Pjo6dGVtcGxhdGUKKyAgICAgICAgICAgICAgICAg ICAgX05vbk5lc3RlZFR1cGxlPGNvbnN0IHR1cGxlPF9VRWxlbWVudHMuLi4+ Jj4oKSwKICAgICAgICAgYm9vbD46OnR5cGU9ZmFsc2U+CiAgICAgICAgIGV4 cGxpY2l0IGNvbnN0ZXhwciB0dXBsZShjb25zdCB0dXBsZTxfVUVsZW1lbnRz Li4uPiYgX19pbikKICAgICAgICAgOiBfSW5oZXJpdGVkKHN0YXRpY19jYXN0 PGNvbnN0IF9UdXBsZV9pbXBsPDAsIF9VRWxlbWVudHMuLi4+Jj4oX19pbikp CiAgICAgICAgIHsgfQogCi0gICAgICB0ZW1wbGF0ZTx0eXBlbmFtZS4uLiBf VUVsZW1lbnRzLCB0eXBlbmFtZQorICAgICAgdGVtcGxhdGU8dHlwZW5hbWUu Li4gX1VFbGVtZW50cywgdHlwZW5hbWUgX0R1bW15ID0gdm9pZCwgdHlwZW5h bWUKICAgICAgICAgZW5hYmxlX2lmPF9UTUM8X1VFbGVtZW50cy4uLj46OnRl bXBsYXRlCiAgICAgICAgICAgICAgICAgICAgIF9Nb3ZlQ29uc3RydWN0aWJs ZVR1cGxlPF9VRWxlbWVudHMuLi4+KCkKICAgICAgICAgICAgICAgICAgICYm IF9UTUM8X1VFbGVtZW50cy4uLj46OnRlbXBsYXRlCi0gICAgICAgICAgICAg ICAgICAgIF9JbXBsaWNpdGx5TW92ZUNvbnZlcnRpYmxlVHVwbGU8X1VFbGVt ZW50cy4uLj4oKSwKKyAgICAgICAgICAgICAgICAgICAgX0ltcGxpY2l0bHlN b3ZlQ29udmVydGlibGVUdXBsZTxfVUVsZW1lbnRzLi4uPigpCisgICAgICAg ICAgICAgICAgICAmJiBfVE5UQzxfRHVtbXk+Ojp0ZW1wbGF0ZQorICAgICAg ICAgICAgICAgICAgICBfTm9uTmVzdGVkVHVwbGU8dHVwbGU8X1VFbGVtZW50 cy4uLj4mJj4oKSwKICAgICAgICAgYm9vbD46OnR5cGU9dHJ1ZT4KICAgICAg ICAgY29uc3RleHByIHR1cGxlKHR1cGxlPF9VRWxlbWVudHMuLi4+JiYgX19p bikKICAgICAgICAgOiBfSW5oZXJpdGVkKHN0YXRpY19jYXN0PF9UdXBsZV9p bXBsPDAsIF9VRWxlbWVudHMuLi4+JiY+KF9faW4pKSB7IH0KIAotICAgICAg dGVtcGxhdGU8dHlwZW5hbWUuLi4gX1VFbGVtZW50cywgdHlwZW5hbWUKKyAg ICAgIHRlbXBsYXRlPHR5cGVuYW1lLi4uIF9VRWxlbWVudHMsIHR5cGVuYW1l IF9EdW1teSA9IHZvaWQsIHR5cGVuYW1lCiAgICAgICAgIGVuYWJsZV9pZjxf VE1DPF9VRWxlbWVudHMuLi4+Ojp0ZW1wbGF0ZQogICAgICAgICAgICAgICAg ICAgICBfTW92ZUNvbnN0cnVjdGlibGVUdXBsZTxfVUVsZW1lbnRzLi4uPigp CiAgICAgICAgICAgICAgICAgICAmJiAhX1RNQzxfVUVsZW1lbnRzLi4uPjo6 dGVtcGxhdGUKLSAgICAgICAgICAgICAgICAgICAgX0ltcGxpY2l0bHlNb3Zl Q29udmVydGlibGVUdXBsZTxfVUVsZW1lbnRzLi4uPigpLAorICAgICAgICAg ICAgICAgICAgICBfSW1wbGljaXRseU1vdmVDb252ZXJ0aWJsZVR1cGxlPF9V RWxlbWVudHMuLi4+KCkKKyAgICAgICAgICAgICAgICAgICYmIF9UTlRDPF9E dW1teT46OnRlbXBsYXRlCisgICAgICAgICAgICAgICAgICAgIF9Ob25OZXN0 ZWRUdXBsZTx0dXBsZTxfVUVsZW1lbnRzLi4uPiYmPigpLAogICAgICAgICBi b29sPjo6dHlwZT1mYWxzZT4KICAgICAgICAgZXhwbGljaXQgY29uc3RleHBy IHR1cGxlKHR1cGxlPF9VRWxlbWVudHMuLi4+JiYgX19pbikKICAgICAgICAg OiBfSW5oZXJpdGVkKHN0YXRpY19jYXN0PF9UdXBsZV9pbXBsPDAsIF9VRWxl bWVudHMuLi4+JiY+KF9faW4pKSB7IH0KZGlmZiAtLWdpdCBhL2xpYnN0ZGMr Ky12My90ZXN0c3VpdGUvMjBfdXRpbC90dXBsZS9jb25zL25lc3RlZF90dXBs ZV9jb25zdHJ1Y3QuY2MgYi9saWJzdGRjKystdjMvdGVzdHN1aXRlLzIwX3V0 aWwvdHVwbGUvY29ucy9uZXN0ZWRfdHVwbGVfY29uc3RydWN0LmNjCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjMyZWYzY2MKLS0tIC9k ZXYvbnVsbAorKysgYi9saWJzdGRjKystdjMvdGVzdHN1aXRlLzIwX3V0aWwv dHVwbGUvY29ucy9uZXN0ZWRfdHVwbGVfY29uc3RydWN0LmNjCkBAIC0wLDAg KzEsNjAgQEAKKyNpbmNsdWRlIDxzdHJpbmc+CisjaW5jbHVkZSA8dHVwbGU+ CisjaW5jbHVkZSA8dGVzdHN1aXRlX2hvb2tzLmg+CisKK3N0YXRpYyBzdGQ6 OnN0cmluZyByZXN1bHQ7CisKK3N0cnVjdCBYIHsKKyAgaW50IHN0YXRlOyAv LyB0aGlzIGhhcyB0byBiZSBoZXJlCisgIFgoKSB7CisgICAgcmVzdWx0ICs9 ICJEZWYiOworICB9CisKKyAgWChYIGNvbnN0JikgeworICAgIHJlc3VsdCAr PSAiQ29weSI7CisgIH0KKworICBYKFgmJikgeworICAgIHJlc3VsdCArPSAi TW92ZSI7CisgIH0KKworICB+WCgpIHsKKyAgICByZXN1bHQgKz0gIkR0b3Ii OworICB9Cit9OworCit2b2lkIGYoKQoreworICBYIHY7CisgIHN0ZDo6dHVw bGU8WD4gdDF7dn07CisgIHN0ZDo6dHVwbGU8c3RkOjp0dXBsZTxYPiYmPiB0 MntzdGQ6Om1vdmUodDEpfTsKKyAgc3RkOjp0dXBsZTxzdGQ6OnR1cGxlPFg+ PiB0M3tzdGQ6Om1vdmUodDIpfTsKK30KKwordm9pZCBmMigpCit7CisgIFgg djsKKyAgc3RkOjp0dXBsZTxYPiB0MXtzdGQ6Om1vdmUodil9OworICBzdGQ6 OnR1cGxlPHN0ZDo6dHVwbGU8WD4mJj4gdDJ7c3RkOjptb3ZlKHQxKX07Cisg IHN0ZDo6dHVwbGU8c3RkOjp0dXBsZTxYPj4gdDN7c3RkOjptb3ZlKHQyKX07 Cit9CisKK3ZvaWQgZjMoKQoreworICBzdGQ6OnR1cGxlPFg+IHQxe1h7fX07 CisgIHN0ZDo6dHVwbGU8c3RkOjp0dXBsZTxYPiYmPiB0MntzdGQ6Om1vdmUo dDEpfTsKKyAgc3RkOjp0dXBsZTxzdGQ6OnR1cGxlPFg+PiB0M3tzdGQ6Om1v dmUodDIpfTsKK30KKworaW50IG1haW4oKQoreworICBmKCk7CisgIFZFUklG WShyZXN1bHQgPT0gIkRlZkNvcHlNb3ZlRHRvckR0b3JEdG9yIik7CisgIHJl c3VsdCA9ICIiOworICBmMigpOworICBWRVJJRlkocmVzdWx0ID09ICJEZWZN b3ZlTW92ZUR0b3JEdG9yRHRvciIpOworICByZXN1bHQgPSAiIjsKKyAgZjMo KTsKKyAgVkVSSUZZKHJlc3VsdCA9PSAiRGVmTW92ZUR0b3JNb3ZlRHRvckR0 b3IiKTsKKyAgcmVzdWx0ID0gIiI7Cit9Cg== --001a11430fdc909f1505208f1a30--