From patchwork Tue Nov 6 00:21:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 197372 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 C44F42C00BF for ; Tue, 6 Nov 2012 11:21:21 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1352766082; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:In-Reply-To:References:Date: Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=X1GCSxJ35wdHPKj5mvhW3CQE34c=; b=BgQdT9T1ga/ZK1n ORcoKDUxmxy+U9G/24coT6Fw34abTgJfhPFaOFaq1GYGYBR/CcIKGuqhv+LZ5bZW 7fmWz0fTUF0XbjeCPt7YhuJepLIqKJuisDKA+FnOTTn+P7EQmDgBLijY9awejAC1 1+mW7d8WDjV8p6ZXCjt4V0xdFExU= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:In-Reply-To:References:Date:Message-ID:Subject:From:To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=ywPglLl13CFz9WGE23SzgGj80CPNeKSIangoAW3558/SvZ+e0CS1bMbQeBEnxj 2fnRYYVH0MOxBBeyTWJrfgxRi3T+ONI/rFPSkStS/O+eUPpAH3u4QcqpUZepPpXO gOwhqtyVaLTB9w1Pc7wG+V5CxLLhO/hMeM3JnT50eIong=; Received: (qmail 7681 invoked by alias); 6 Nov 2012 00:21:14 -0000 Received: (qmail 7668 invoked by uid 22791); 6 Nov 2012 00:21:13 -0000 X-SWARE-Spam-Status: No, hits=-5.2 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-ie0-f175.google.com (HELO mail-ie0-f175.google.com) (209.85.223.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 06 Nov 2012 00:21:08 +0000 Received: by mail-ie0-f175.google.com with SMTP id c13so9643351ieb.20 for ; Mon, 05 Nov 2012 16:21:07 -0800 (PST) MIME-Version: 1.0 Received: by 10.50.219.129 with SMTP id po1mr11169172igc.35.1352161267549; Mon, 05 Nov 2012 16:21:07 -0800 (PST) Received: by 10.42.158.202 with HTTP; Mon, 5 Nov 2012 16:21:07 -0800 (PST) In-Reply-To: References: Date: Tue, 6 Nov 2012 00:21:07 +0000 Message-ID: Subject: Re: [v3] Fix profile mode failures From: Jonathan Wakely To: "libstdc++" , gcc-patches 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 6 November 2012 00:06, Jonathan Wakely wrote: > > There's still a failure for 23_containers/map/modifiers/emplace/1.cc > (which didn't even compile in profile mode previously) that I'll look > into. That turned out to be trivial, fixed like so. * include/profile/map.h (map::emplace_hint): Add missing return. Tested x86_64-linux, committed to trunk. diff --git a/libstdc++-v3/include/profile/map.h b/libstdc++-v3/include/profile/map.h index fe2f456..f96f18b 100644 --- a/libstdc++-v3/include/profile/map.h +++ b/libstdc++-v3/include/profile/map.h @@ -261,6 +261,7 @@ namespace __profile std::forward<_Args>(__args)...); __profcxx_map_to_unordered_map_insert(this, size_before, size() - size_before); + return __res; } #endif