From patchwork Thu Dec 9 04:23:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nathan Froyd X-Patchwork-Id: 74848 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]) by ozlabs.org (Postfix) with SMTP id 45B51B70E8 for ; Thu, 9 Dec 2010 15:24:22 +1100 (EST) Received: (qmail 5175 invoked by alias); 9 Dec 2010 04:24:18 -0000 Received: (qmail 5158 invoked by uid 22791); 9 Dec 2010 04:24:17 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 09 Dec 2010 04:24:05 +0000 Received: (qmail 32309 invoked from network); 9 Dec 2010 04:24:02 -0000 Received: from unknown (HELO codesourcery.com) (froydnj@127.0.0.2) by mail.codesourcery.com with ESMTPA; 9 Dec 2010 04:24:02 -0000 Date: Wed, 8 Dec 2010 23:23:59 -0500 From: Nathan Froyd To: "H.J. Lu" Cc: Jason Merrill , gcc-patches@gcc.gnu.org, mark@codesourcery.com, libstdc++@gcc.gnu.org Subject: Re: [RFC, c++] fix PR 45329, provide information on overload resolution Message-ID: <20101209042357.GG25904@nightcrawler> References: <20101117204631.GE24469@nightcrawler> <4CE6FD56.1080800@redhat.com> <20101202220946.GH18963@nightcrawler> <4CF921F9.9070700@redhat.com> <20101208145831.GX25904@nightcrawler> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-IsSubscribed: yes 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 On Wed, Dec 08, 2010 at 04:32:39PM -0800, H.J. Lu wrote: > On Wed, Dec 8, 2010 at 6:58 AM, Nathan Froyd wrote: > > gcc/cp/ > >        PR c++/45329 > > This caused: > > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46860 Oops. Sorry about that. Here's a patch to fix the overlooked libstdc++ test cases. Tested on x86_64-unknown-linux-gnu. OK to commit? -Nathan libstdc++-v3/ PR testsuite/46860 * testsuite/20_util/auto_ptr/assign_neg.cc: Adjust. * testsuite/20_util/unique_ptr/assign/assign_neg.cc: Adjust. * testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust. diff --git a/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc b/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc index 1f6e673..0fea060 100644 --- a/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc +++ b/libstdc++-v3/testsuite/20_util/auto_ptr/assign_neg.cc @@ -37,6 +37,7 @@ test01() { std::auto_ptr ptr2; ptr2 = new Base; // { dg-error "no match" } + // { dg-error "candidate" "candidate note" { target *-*-* } 39 } return 0; } @@ -46,6 +47,6 @@ main() test01(); return 0; } -// { dg-error "candidates" "" { target *-*-* } 134 } +// { dg-error "::auto_ptr|no known conversion" "" { target *-*-* } 134 } // { dg-error "note" "" { target *-*-* } 152 } -// { dg-error "::auto_ptr" "" { target *-*-* } 262 } +// { dg-error "::auto_ptr|no known conversion" "" { target *-*-* } 262 } diff --git a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc index 95c1d5d..501bad3 100644 --- a/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc +++ b/libstdc++-v3/testsuite/20_util/unique_ptr/assign/assign_neg.cc @@ -46,6 +46,7 @@ void test03() { std::unique_ptr p1(new int[3]); // { dg-error "no match" } + // { dg-error "candidate" "candidate-note" { target *-*-* } 48 } std::unique_ptr p2 = p1; // { dg-error "deleted" } } diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc index 019f5f7..c26b09d 100644 --- a/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc +++ b/libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc @@ -31,6 +31,7 @@ test01() { std::weak_ptr p1; p1 < p1; // { dg-error "no match" } + // { dg-error "candidate" "candidate note" { target *-*-* } 33 } return 0; }