From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 109508 invoked by alias); 9 Aug 2017 19:21:24 -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 109189 invoked by uid 89); 9 Aug 2017 19:21:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy= X-HELO: mail-it0-f49.google.com Received: from mail-it0-f49.google.com (HELO mail-it0-f49.google.com) (209.85.214.49) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Aug 2017 19:21:22 +0000 Received: by mail-it0-f49.google.com with SMTP id 76so2782334ith.0 for ; Wed, 09 Aug 2017 12:21:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=H3w/c/0GVXkgrzECOqMadltnBOPZf1Z6EtXCutZHdUA=; b=P9NkgzrcLP7oEY9ETR7OjPPM7AqFZeaDyeKkFYExgcvc8ilKA5nrXZdhSbzRIdxJsp LIgzoVimnL49sG9j8wtMsrR4C1rH5zpSPSw5+nKR3TtUEp8uG6JhWcV7Qrt1+PA+ZKW3 GkWAireCJNHAzbyHuqmjsApKIFOzw5c/SuCc0U3pGHZoOMV8yEbEji+Ohk/qs/aax4pR D8AS7lq7zbnLjAdbApwKTnUFRNkjPU+x1svKdVSfiEaiEG56IR0XGZPwlEGcEvno6oTM bLz6riqS+zcO/wDTYkEtdtXgxBmE16aokJOmK9kWL5W5ZIHni2tfvUOpqmpP60o+y5v3 lTgw== X-Gm-Message-State: AHYfb5hl7BNsyfXy5wEGB3xqRGT9kOaY+oV3YDtF0o681jLxyuhMmRCX A7tpGPBHvW5S2TNvaimV6BqZJS4ToX25L3o= X-Received: by 10.36.178.76 with SMTP id h12mr8411983iti.108.1502306480310; Wed, 09 Aug 2017 12:21:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.63.195 with HTTP; Wed, 9 Aug 2017 12:20:59 -0700 (PDT) From: Jason Merrill Date: Wed, 09 Aug 2017 19:25:00 -0000 Message-ID: Subject: C++ PATCH for c++/81525, auto and generic lambda To: gcc-patches List Content-Type: multipart/mixed; boundary="f403045d9cce1ab66b055656fcd9" X-IsSubscribed: yes X-SW-Source: 2017-08/txt/msg00696.txt.bz2 --f403045d9cce1ab66b055656fcd9 Content-Type: text/plain; charset="UTF-8" Content-length: 251 In this testcase, when building up an extra version of N to refer to when instantiating the generic lambda, we were mistakenly replacing the 'auto' with a template argument for the generic lambda. Tested x86_64-pc-linux-gnu, applying to trunk and 7. --f403045d9cce1ab66b055656fcd9 Content-Type: text/plain; charset="US-ASCII"; name="81525.diff" Content-Disposition: attachment; filename="81525.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_j65efow50 Content-length: 3046 Y29tbWl0IGU0MmUxY2MxNjIyNjdiODVhZGZiNjI0ZGFmMWI5NmZjMmY1YTZm NWIKQXV0aG9yOiBKYXNvbiBNZXJyaWxsIDxqYXNvbkByZWRoYXQuY29tPgpE YXRlOiAgIE1vbiBBdWcgNyAxNTowNTo1MSAyMDE3IC0wNDAwCgogICAgICAg ICAgICBQUiBjKysvODE1MjUgLSB3cm9uZyBjb25zdGFudCB2YWx1ZSB3aXRo IGdlbmVyaWMgbGFtYmRhCiAgICAKICAgICAgICAgICAgKiBwdC5jICh0c3Vi c3RfZGVjbCkgW1ZBUl9ERUNMXTogQXZvaWQgY2xvYmJlcmluZyBhdXRvLgog ICAgICAgICAgICAodHN1YnN0X2NvcHkpIFtWQVJfREVDTF06IEhhbmRsZSBh dXRvLgoKZGlmZiAtLWdpdCBhL2djYy9jcC9wdC5jIGIvZ2NjL2NwL3B0LmMK aW5kZXggM2Q2ZjRiNS4uMGY4OTliOSAxMDA2NDQKLS0tIGEvZ2NjL2NwL3B0 LmMKKysrIGIvZ2NjL2NwL3B0LmMKQEAgLTEyODc1LDcgKzEyODc1LDE1IEBA IHRzdWJzdF9kZWNsICh0cmVlIHQsIHRyZWUgYXJncywgdHN1YnN0X2ZsYWdz X3QgY29tcGxhaW4pCiAJCSYmIFZBUl9IQURfVU5LTk9XTl9CT1VORCAodCkK IAkJJiYgdHlwZSAhPSBlcnJvcl9tYXJrX25vZGUpCiAJICAgICAgdHlwZSA9 IHN0cmlwX2FycmF5X2RvbWFpbiAodHlwZSk7CisJICAgIHRyZWUgYXV0b19u b2RlID0gdHlwZV91c2VzX2F1dG8gKHR5cGUpOworCSAgICBpbnQgbGVuID0g VFJFRV9WRUNfTEVOR1RIIChhcmdzKTsKKwkgICAgaWYgKGF1dG9fbm9kZSkK KwkgICAgICAvKiBNYXNrIG9mZiBhbnkgdGVtcGxhdGUgYXJncyBwYXN0IHRo ZSB2YXJpYWJsZSdzIGNvbnRleHQgc28gd2UKKwkJIGRvbid0IHJlcGxhY2Ug dGhlIGF1dG8gd2l0aCBhbiB1bnJlbGF0ZWQgYXJndW1lbnQuICAqLworCSAg ICAgIFRSRUVfVkVDX0xFTkdUSCAoYXJncykgPSBURU1QTEFURV9UWVBFX0xF VkVMIChhdXRvX25vZGUpIC0gMTsKIAkgICAgdHlwZSA9IHRzdWJzdCAodHlw ZSwgYXJncywgY29tcGxhaW4sIGluX2RlY2wpOworCSAgICBpZiAoYXV0b19u b2RlKQorCSAgICAgIFRSRUVfVkVDX0xFTkdUSCAoYXJncykgPSBsZW47CiAJ ICB9CiAJaWYgKFZBUl9QIChyKSkKIAkgIHsKQEAgLTE0NjU2LDYgKzE0NjY0 LDEwIEBAIHRzdWJzdF9jb3B5ICh0cmVlIHQsIHRyZWUgYXJncywgdHN1YnN0 X2ZsYWdzX3QgY29tcGxhaW4sIHRyZWUgaW5fZGVjbCkKIAkJCURFQ0xfSU5J VElBTElaRURfQllfQ09OU1RBTlRfRVhQUkVTU0lPTl9QIChyKQogCQkJICA9 IFRSRUVfQ09OU1RBTlQgKHIpID0gdHJ1ZTsKIAkJICAgICAgREVDTF9JTklU SUFMIChyKSA9IGluaXQ7CisJCSAgICAgIGlmICh0cmVlIGF1dG9fbm9kZSA9 IHR5cGVfdXNlc19hdXRvIChUUkVFX1RZUEUgKHIpKSkKKwkJCVRSRUVfVFlQ RSAocikKKwkJCSAgPSBkb19hdXRvX2RlZHVjdGlvbiAoVFJFRV9UWVBFIChy KSwgaW5pdCwgYXV0b19ub2RlLAorCQkJCQkgICAgICAgY29tcGxhaW4sIGFk Y192YXJpYWJsZV90eXBlKTsKIAkJICAgIH0KIAkJICBnY2NfYXNzZXJ0IChj cF91bmV2YWx1YXRlZF9vcGVyYW5kIHx8IFRSRUVfU1RBVElDIChyKQogCQkJ ICAgICAgfHwgZGVjbF9jb25zdGFudF92YXJfcCAocikKZGlmZiAtLWdpdCBh L2djYy90ZXN0c3VpdGUvZysrLmRnL2NwcDF5L2xhbWJkYS1nZW5lcmljLWNv bnN0NC5DIGIvZ2NjL3Rlc3RzdWl0ZS9nKysuZGcvY3BwMXkvbGFtYmRhLWdl bmVyaWMtY29uc3Q0LkMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uNTJmNDM3MwotLS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3Vp dGUvZysrLmRnL2NwcDF5L2xhbWJkYS1nZW5lcmljLWNvbnN0NC5DCkBAIC0w LDAgKzEsMjAgQEAKKy8vIFBSIGMrKy84MTUyNQorLy8geyBkZy1kbyBjb21w aWxlIHsgdGFyZ2V0IGMrKzE0IH0gfQorCit0ZW1wbGF0ZSA8aW50IGk+IHN0 cnVjdCBBIHsKKyAgY29uc3RleHByIG9wZXJhdG9yIGludCAoKSBjb25zdCB7 IHJldHVybiBpOyB9Cit9OwordGVtcGxhdGUgPGludCBpPiBjb25zdGV4cHIg QTxpPiBhID0ge307CisKK3RlbXBsYXRlIDx0eXBlbmFtZSBGPiB2b2lkIGZv byAoRiBmKSB7CisgIGYgKEE8MD57fSk7Cit9Cit0ZW1wbGF0ZSA8dHlwZW5h bWUgVD4KK3ZvaWQgYmFyIChUKSB7CisgIGNvbnN0ZXhwciBhdXRvIE4gPSBh PDE+OworICBhdXRvIGYgPSBbJl0gKGF1dG8gaSkgeworICAgIHN0YXRpY19h c3NlcnQgKHN0YXRpY19jYXN0PGludD4oTikgPT0gMSwgIiIpOworICB9Owor ICBmb28gKGYpOworfQoraW50IG1haW4gKCkgeyBiYXIgKDApOyB9Cg== --f403045d9cce1ab66b055656fcd9--