From patchwork Tue May 21 08:18:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 245219 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 2A51E2C00AE for ; Tue, 21 May 2013 18:18:26 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; q= dns; s=default; b=lgMumwxVEpWFKM16gsHgjD30ciYBNPagwg0zEk8UhTq283 6fLpEOU58lYvouKxq6l7l78VeshTIHGhOYYo+XCMeesgX+SoSBogTG2ufM1wCiDp tWsJwibu3f4ZCfT5KMtgUDq76702R1GwfgIA64Dc0/T/AkCSRpu1CLZB/LgaA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:date:message-id:subject:from:to:content-type; s= default; bh=vAn3shkPK4rTdBfRO/nE/MHq/po=; b=xTzTkfUlsZKkLnqY/i8C 3hZfp996owJ7aHydvXJ1y+dShihGs31NrFsJ+/SgHa1X3xdaWiFaTgQOMmO5f7IQ QK/vAmKnsPSYsnOGGgortBr1bAgBuKSlfbTz4FxuN+6UwHVC2tNxPuvHee6i330x dCmYDnWP9tQXzaItLcw+1p4= Received: (qmail 16052 invoked by alias); 21 May 2013 08:18:19 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 16032 invoked by uid 89); 21 May 2013 08:18:19 -0000 X-Spam-SWARE-Status: No, score=-2.8 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, SPF_PASS autolearn=ham version=3.3.1 X-Spam-User: qpsmtpd, 2 recipients Received: from mail-la0-f49.google.com (HELO mail-la0-f49.google.com) (209.85.215.49) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 21 May 2013 08:18:18 +0000 Received: by mail-la0-f49.google.com with SMTP id fp13so349960lab.22 for ; Tue, 21 May 2013 01:18:15 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.152.87.39 with SMTP id u7mr669480laz.48.1369124295591; Tue, 21 May 2013 01:18:15 -0700 (PDT) Received: by 10.112.166.101 with HTTP; Tue, 21 May 2013 01:18:15 -0700 (PDT) Date: Tue, 21 May 2013 09:18:15 +0100 Message-ID: Subject: [patch] fix libstdc++/57336 From: Jonathan Wakely To: "libstdc++" , gcc-patches , Jakub Jelinek X-Virus-Found: No This broke due to some front end changes that disallow forming function types that return abstract types. std::reference_wrapper always passes an lvalue reference to __invoke so it's correct to use an lvalue reference as the result_of's template argument. PR libstdc++/57336 * include/std/functional (__invoke): Do not form function types with abstract return type. * testsuite/20_util/reference_wrapper/invoke-3.cc: New. Tested x86_64-linux, committed to trunk. Jakub, this is a regression against 4.8.0, should it go on the branch too? The change is small and isolated to code used by std::reference_wrapper. commit 4b5557d04acb37fed7686e720ba0af0ed3428c56 Author: Jonathan Wakely Date: Tue May 21 08:52:16 2013 +0100 PR libstdc++/57336 * include/std/functional (__invoke): Do not form function types with abstract return type. * testsuite/20_util/reference_wrapper/invoke-3.cc: New. diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index 44d3fd5..63ba777 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -195,7 +195,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) (!is_member_pointer<_Functor>::value && !is_function<_Functor>::value && !is_function::type>::value), - typename result_of<_Functor(_Args&&...)>::type + typename result_of<_Functor&(_Args&&...)>::type >::type __invoke(_Functor& __f, _Args&&... __args) { diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-3.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-3.cc new file mode 100644 index 0000000..4291a67 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/invoke-3.cc @@ -0,0 +1,37 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2013 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// 20.8.3.4 reference_wrapper invocation [refwrap.invoke] +#include + +struct ABC +{ + virtual bool operator()() const = 0; +}; + +struct Concrete : ABC +{ + virtual bool operator()() const { return true; } +}; + +Concrete c; +ABC& abc = c; + +auto b = std::cref(abc)();