From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 112239 invoked by alias); 1 May 2015 17:02:55 -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 112221 invoked by uid 89); 1 May 2015 17:02:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 01 May 2015 17:02:53 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t41H2poF017800 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 1 May 2015 13:02:52 -0400 Received: from localhost (ovpn-116-62.ams2.redhat.com [10.36.116.62]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t41H2pZs022358; Fri, 1 May 2015 13:02:51 -0400 Date: Fri, 01 May 2015 17:02:00 -0000 From: Jonathan Wakely To: Doug Evans Cc: gcc-patches , libstdc++ Subject: Re: [PATCH] libstdc++: Fix list.cc xmethods test. Message-ID: <20150501170250.GG3618@redhat.com> References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Nx8xdmI2KD3LNVVP" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-05/txt/msg00079.txt.bz2 --Nx8xdmI2KD3LNVVP Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 1074 On 29/04/15 17:18 +0100, Jonathan Wakely wrote: >On 29 April 2015 at 17:04, Doug Evans wrote: >> Tested the same patch on the gcc 5.0 branch. >> Just double checking ... ok to apply there too? > >Yes, OK for the branch too. > >> btw, the test is currently marked as unsupported by the test run. >> I don't know what would be involved in marking it as failing instead, >> but I noticed this happening a lot while I was working with this code. >> I can imagine more failures going unnoticed because of this. > >That's due to: > >(*): Shared library is missing debugging information.^M >skipping: (*): Shared library is missing debugging information.^M >list.gdb:10: Error in sourced command file:^M >Cannot evaluate function -- may be inlined^M >skipping: list.gdb:10: Error in sourced command file:^M >skipping: Cannot evaluate function -- may be inlined^M >UNSUPPORTED: libstdc++-xmethods/list.cc > >But I can't say anything more useful than that. This might be all that's needed to make it work with the new list, but I can't test it due to the UNSUPPORTED error above. --Nx8xdmI2KD3LNVVP Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 1174 diff --git a/libstdc++-v3/python/libstdcxx/v6/xmethods.py b/libstdc++-v3/python/libstdcxx/v6/xmethods.py index 6db0e16..112d854 100644 --- a/libstdc++-v3/python/libstdcxx/v6/xmethods.py +++ b/libstdc++-v3/python/libstdcxx/v6/xmethods.py @@ -382,7 +382,8 @@ class ListMethodsMatcher(gdb.xmethod.XMethodMatcher): def match(self, class_type, method_name): if not re.match('^std::list<.*>$', class_type.tag): - return None + if not re.match('^std::__cxx11::list<.*>$', class_type.tag): + return None method = self._method_dict.get(method_name) if method is None or not method.enabled: return None diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/list.cc b/libstdc++-v3/testsuite/libstdc++-xmethods/list.cc index 050f75b..6c02de9 100644 --- a/libstdc++-v3/testsuite/libstdc++-xmethods/list.cc +++ b/libstdc++-v3/testsuite/libstdc++-xmethods/list.cc @@ -18,9 +18,6 @@ // with this library; see the file COPYING3. If not see // . -// List xmethods only recognize the non cxx11 std::list for now. -#define _GLIBCXX_USE_CXX11_ABI 0 - #include int --Nx8xdmI2KD3LNVVP--