From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx.kolabnow.com (mx.kolabnow.com [212.103.80.154]) by sourceware.org (Postfix) with ESMTPS id DDF89385AC2D; Wed, 24 Aug 2022 07:12:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DDF89385AC2D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lambda.is Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lambda.is Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id E59CBCB1; Wed, 24 Aug 2022 09:12:08 +0200 (CEST) Authentication-Results: ext-mx-out002.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:in-reply-to :from:from:references:content-language:subject:subject :mime-version:date:date:message-id:received:received:received; s=dkim20160331; t=1661325128; x=1663139529; bh=k2LkeSpkQ04v/dNi e3T7cwYz1Yle8jUoMvUs7mgcX4A=; b=u1yi9TGDlYOZdzFPKNlv6m9SpLrtnsal 8tF/eyyJyayiCwiYsXb/P3P+sCptdEE+whCAUiyeBDfMaUSJs4qtKS4C/mVMRCPJ i4UxIOCqL1iTfaeDm9TpvcYxrSQBeUA8eSRQ+Ip/O+1wN7A4Ft0vCjvFOJ31Kg0Y F8AoZ6oJ9PR6Fmi94ChBtoOzB9Ogpa0nufpPYLaC658K9wAON9bsJqqhmPHslDiF WFW+ZHwm/6uVk/MrRQNdiLRb4a6IhIFM2d3BRUKgNVe0cvZwiLIZ+tuAmLDrEZnz JGjrtl2B0waX9ftT+2EjNjUs5dqS1Q5lnaUR9RCCuFMB3fr3Gu+PQh7qw/XIbC0u uI1ZbPfHqTzRtAvmC/cr6OHhc/Vg40ZimfvUNUBgOVFRpETvWNpJTu7u9z6/c7Er MiZ4N4sdAFR5pZ0nsVAAMQDHqfX3ZqKVWNwQO0Nni/RRIgR4ZK/DJ8dUpxuSqjnN 4Jm/yHg/RyEwKcjQGgqxK4HNQYS3pJuZ/sbef5xtgS1X21DO+hPhpOz0lPlWq0Ii IxLoM2B2Z33ZU0ZyHzigrDthDPIiTwWWiNu15epGzPNJzpJ//gjDMf7s/VrAijmD BZw/665/eNpgwUa1LcuA9ZeZP3WXBWsD8q9ejvpqWh/KmqNgph8XbXGwwpioBDik 0rvQi3YQ5AY= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q2XnBhOy1yYY; Wed, 24 Aug 2022 09:12:08 +0200 (CEST) Received: from int-mx003.mykolab.com (unknown [10.9.13.3]) by mx.kolabnow.com (Postfix) with ESMTPS id 896FD829; Wed, 24 Aug 2022 09:12:07 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx003.mykolab.com (Postfix) with ESMTPS id 41935209A; Wed, 24 Aug 2022 09:12:07 +0200 (CEST) Message-ID: Date: Wed, 24 Aug 2022 09:12:05 +0200 MIME-Version: 1.0 Subject: Re: [PATCH] gcov: fix file and function summary information Content-Language: en-US To: =?UTF-8?Q?Martin_Li=c5=a1ka?= , gcc-patches@gcc.gnu.org Cc: GCC Development References: <3c93e70d-293e-2190-125b-f840c31d2087@lambda.is> <643928f9-d0e0-e099-6846-d3548f14b455@suse.cz> From: =?UTF-8?Q?J=c3=b8rgen_Kvalsvik?= In-Reply-To: <643928f9-d0e0-e099-6846-d3548f14b455@suse.cz> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 22/08/2022 21:25, Martin Liška wrote: > Patch can bootstrap on x86_64-linux-gnu and survives regression tests. > > Jorgen: Can you please test it before I'll install it? > > Thanks, > Martin > > gcc/ChangeLog: > > * gcov.cc (add_line_counts): Add group functions to coverage > summary. > (accumulate_line_counts): Similarly for files. > > Co-Authored-By: Jørgen Kvalsvik > --- > gcc/gcov.cc | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/gcc/gcov.cc b/gcc/gcov.cc > index 27be5ff0911..9cf1071166f 100644 > --- a/gcc/gcov.cc > +++ b/gcc/gcov.cc > @@ -2694,6 +2694,13 @@ add_line_counts (coverage_info *coverage, function_info *fn) > { > gcc_assert (lines[j] - fn->start_line < fn->lines.size ()); > line = &(fn->lines[lines[j] - fn->start_line]); > + if (coverage) > + { > + if (!line->exists) > + coverage->lines++; > + if (!line->count && block->count) > + coverage->lines_executed++; > + } > line->exists = 1; > if (!block->exceptional) > { > @@ -2815,7 +2822,7 @@ accumulate_line_counts (source_info *src) > it2 != fn->lines.end (); it2++) > { > line_info *line = &(*it2); > - accumulate_line_info (line, src, false); > + accumulate_line_info (line, src, true); > } > } > I tested it and get the file summary as expected: File 'demo.cc' Lines executed:84.62% of 26 Branches executed:100.00% of 6 Taken at least once:50.00% of 6 Calls executed:100.00% of 4 Creating 'demo.cc.gcov' Thanks, Jørgen