From patchwork Thu Nov 9 10:24:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 836276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-466368-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="uQ1jFbo4"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yXfVC6zYvz9s71 for ; Thu, 9 Nov 2017 21:26:59 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :resent-from:resent-to:resent-date:resent-message-id:message-id :in-reply-to:references:from:date:subject:to:cc; q=dns; s= default; b=AYtyZJKgXl57+zL/wXpn31vAMpNevCcvH7XOFIM8jtAKvWMSk8N/U a6Hfn9N6k99i7Xr3ysnWjdW4qEnDElR0TYgNxFZVMHgL4fkxIrX70NwhnUYTxcgv dPLUrUyzRC70PbALW0GtQiyNL0uPQMUXqTSpwdpXHtVTYOkCjLVVKE= 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 :resent-from:resent-to:resent-date:resent-message-id:message-id :in-reply-to:references:from:date:subject:to:cc; s=default; bh=c N0XP4cZwKSD7WjF/5zy0bvA3eA=; b=uQ1jFbo4pD3MNSWPuprujL+XjbNa8fNCK 9X4O5NCZgOpEDnxrVJL0yW9/1fsOZyYpY6o3erZ4OZfRp+ZZhoy1aGxq0/3dg82x n0jr7dGrV4wo3WqKuExl2i2M1WStmeb+BQvp5DtCTHWqE1P50MVwwPR9sz7qV75b /hXkrnK20g= Received: (qmail 55730 invoked by alias); 9 Nov 2017 10:25: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 55702 invoked by uid 89); 9 Nov 2017 10:25:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy=COVERAGE, Links, 5597, 1378 X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 09 Nov 2017 10:25:15 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCk19-0004A8-Pw for gcc-patches@gcc.gnu.org; Thu, 09 Nov 2017 05:25:07 -0500 Received: from mx2.suse.de ([195.135.220.15]:46244) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eCk19-00049i-Ft for gcc-patches@gcc.gnu.org; Thu, 09 Nov 2017 05:25:03 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9464DACCF for ; Thu, 9 Nov 2017 10:24:58 +0000 (UTC) Resent-From: =?utf-8?q?Martin_Li=C5=A1ka?= Resent-To: GCC Patches Resent-Date: Thu, 9 Nov 2017 11:24:58 +0100 Resent-Message-ID: Resent-User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 Message-Id: <3076abc035d2621670efd8d1ca0ea6156f199816.1510223055.git.mliska@suse.cz> In-Reply-To: References: From: marxin Date: Thu, 9 Nov 2017 11:24:05 +0100 Subject: [PATCH 5/7] GCOV: remove typedef for arc_t To: gcc-patches@gcc.gnu.org Cc: nathan@acm.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 195.135.220.15 X-IsSubscribed: yes gcc/ChangeLog: 2017-11-09 Martin Liska * gcov.c (struct arc_info): Remove typedef for arc_t. (struct line_info): Likewise. (add_branch_counts): Likewise. (output_branch_count): Likewise. (function_info::~function_info): Likewise. (circuit): Likewise. (output_intermediate_line): Likewise. (read_graph_file): Likewise. (solve_flow_graph): Likewise. (find_exception_blocks): Likewise. (add_line_counts): Likewise. (accumulate_line_info): Likewise. (output_line_details): Likewise. (output_function_details): Likewise. --- gcc/gcov.c | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gcc/gcov.c b/gcc/gcov.c index a1c489bccdc..e33c7b6f8cd 100644 --- a/gcc/gcov.c +++ b/gcc/gcov.c @@ -79,7 +79,7 @@ struct source_info; /* Describes an arc between two basic blocks. */ -typedef struct arc_info +struct arc_info { /* source and destination blocks. */ struct block_info *src; @@ -113,7 +113,7 @@ typedef struct arc_info /* Links to next arc on src and dst lists. */ struct arc_info *succ_next; struct arc_info *pred_next; -} arc_t; +}; /* Describes which locations (lines and files) are associated with a basic block. */ @@ -137,8 +137,8 @@ typedef struct block_info block_info (); /* Chain of exit and entry arcs. */ - arc_t *succ; - arc_t *pred; + arc_info *succ; + arc_info *pred; /* Number of unprocessed exit and entry arcs. */ gcov_type num_succ; @@ -166,7 +166,7 @@ typedef struct block_info { /* Single line graph cycle workspace. Used for all-blocks mode. */ - arc_t *arc; + arc_info *arc; unsigned ident; } cycle; /* Used in all-blocks mode, after blocks are linked onto lines. */ @@ -200,7 +200,7 @@ struct line_info gcov_type count; /* Branches from blocks that end on this line. */ - vector branches; + vector branches; /* blocks which start on this line. Used in all-blocks mode. */ vector blocks; @@ -533,14 +533,14 @@ static void read_graph_file (void); static int read_count_file (void); static void solve_flow_graph (function_info *); static void find_exception_blocks (function_info *); -static void add_branch_counts (coverage_t *, const arc_t *); +static void add_branch_counts (coverage_t *, const arc_info *); static void add_line_counts (coverage_t *, function_info *); static void executed_summary (unsigned, unsigned); static void function_summary (const coverage_t *, const char *); static const char *format_gcov (gcov_type, gcov_type, int); static void accumulate_line_counts (source_info *); static void output_gcov_file (const char *, source_info *); -static int output_branch_count (FILE *, int, const arc_t *); +static int output_branch_count (FILE *, int, const arc_info *); static void output_lines (FILE *, const source_info *); static char *make_gcov_file_name (const char *, const char *); static char *mangle_name (const char *, char *); @@ -559,7 +559,7 @@ function_info::~function_info () { for (int i = blocks.size () - 1; i >= 0; i--) { - arc_t *arc, *arc_n; + arc_info *arc, *arc_n; for (arc = blocks[i].succ; arc; arc = arc_n) { @@ -589,7 +589,7 @@ bool function_info::group_line_p (unsigned n, unsigned src_idx) simple paths)--the node is unblocked only when it participates in a cycle. */ -typedef vector arc_vector_t; +typedef vector arc_vector_t; typedef vector block_vector_t; /* Enum with types of loop in CFG. */ @@ -671,7 +671,7 @@ circuit (block_t *v, arc_vector_t &path, block_t *start, blocked.push_back (v); block_lists.push_back (block_vector_t ()); - for (arc_t *arc = v->succ; arc; arc = arc->succ_next) + for (arc_info *arc = v->succ; arc; arc = arc->succ_next) { block_t *w = arc->dst; if (w < start || !linfo.has_block (w)) @@ -690,7 +690,7 @@ circuit (block_t *v, arc_vector_t &path, block_t *start, if (result != NO_LOOP) unblock (v, blocked, block_lists); else - for (arc_t *arc = v->succ; arc; arc = arc->succ_next) + for (arc_info *arc = v->succ; arc; arc = arc->succ_next) { block_t *w = arc->dst; if (w < start || !linfo.has_block (w)) @@ -960,7 +960,7 @@ output_intermediate_line (FILE *f, line_info *line, unsigned line_num) format_gcov (line->count, 0, -1), line->has_unexecuted_block); - vector::const_iterator it; + vector::const_iterator it; if (flag_branches) for (it = line->branches.begin (); it != line->branches.end (); it++) @@ -1563,7 +1563,7 @@ read_graph_file (void) if (dest >= fn->blocks.size ()) goto corrupt; - arc = XCNEW (arc_t); + arc = XCNEW (arc_info); arc->dst = &fn->blocks[dest]; arc->src = src_blk; @@ -1782,7 +1782,7 @@ static void solve_flow_graph (function_info *fn) { unsigned ix; - arc_t *arc; + arc_info *arc; gcov_type *count_ptr = &fn->counts.front (); block_t *blk; block_t *valid_blocks = NULL; /* valid, but unpropagated blocks. */ @@ -1791,7 +1791,7 @@ solve_flow_graph (function_info *fn) /* The arcs were built in reverse order. Fix that now. */ for (ix = fn->blocks.size (); ix--;) { - arc_t *arc_p, *arc_n; + arc_info *arc_p, *arc_n; for (arc_p = NULL, arc = fn->blocks[ix].succ; arc; arc_p = arc, arc = arc_n) @@ -1884,12 +1884,12 @@ solve_flow_graph (function_info *fn) smart sort. */ if (out_of_order) { - arc_t *start = blk->succ; + arc_info *start = blk->succ; unsigned changes = 1; while (changes) { - arc_t *arc, *arc_p, *arc_n; + arc_info *arc, *arc_p, *arc_n; changes = 0; for (arc_p = NULL, arc = start; (arc_n = arc->succ_next);) @@ -1927,7 +1927,7 @@ solve_flow_graph (function_info *fn) while ((blk = invalid_blocks)) { gcov_type total = 0; - const arc_t *arc; + const arc_info *arc; invalid_blocks = blk->chain; blk->invalid_chain = 0; @@ -1949,7 +1949,7 @@ solve_flow_graph (function_info *fn) while ((blk = valid_blocks)) { gcov_type total; - arc_t *arc, *inv_arc; + arc_info *arc, *inv_arc; valid_blocks = blk->chain; blk->valid_chain = 0; @@ -2057,7 +2057,7 @@ find_exception_blocks (function_info *fn) for (ix = 1; ix;) { block_t *block = queue[--ix]; - const arc_t *arc; + const arc_info *arc; for (arc = block->succ; arc; arc = arc->succ_next) if (!arc->fake && !arc->is_throw && arc->dst->exceptional) @@ -2072,7 +2072,7 @@ find_exception_blocks (function_info *fn) /* Increment totals in COVERAGE according to arc ARC. */ static void -add_branch_counts (coverage_t *coverage, const arc_t *arc) +add_branch_counts (coverage_t *coverage, const arc_info *arc) { if (arc->is_call_non_return) { @@ -2489,7 +2489,7 @@ add_line_counts (coverage_t *coverage, function_info *fn) if (flag_branches) { - arc_t *arc; + arc_info *arc; for (arc = block->succ; arc; arc = arc->succ_next) line->branches.push_back (arc); @@ -2527,10 +2527,10 @@ static void accumulate_line_info (line_info *line, source_info *src, for (vector::iterator it = line->blocks.begin (); it != line->blocks.end (); it++) { - for (arc_t *arc = (*it)->pred; arc; arc = arc->pred_next) + for (arc_info *arc = (*it)->pred; arc; arc = arc->pred_next) if (!line->has_block (arc->src)) count += arc->count; - for (arc_t *arc = (*it)->succ; arc; arc = arc->succ_next) + for (arc_info *arc = (*it)->succ; arc; arc = arc->succ_next) arc->cs_count = arc->count; } @@ -2615,7 +2615,7 @@ accumulate_line_counts (source_info *src) anything is output. */ static int -output_branch_count (FILE *gcov_file, int ix, const arc_t *arc) +output_branch_count (FILE *gcov_file, int ix, const arc_info *arc) { if (arc->is_call_non_return) { @@ -2783,7 +2783,7 @@ output_line_details (FILE *f, const line_info *line, unsigned line_num) { if (flag_all_blocks) { - arc_t *arc; + arc_info *arc; int ix, jx; ix = jx = 0; @@ -2811,7 +2811,7 @@ output_line_details (FILE *f, const line_info *line, unsigned line_num) int ix; ix = 0; - for (vector::const_iterator it = line->branches.begin (); + for (vector::const_iterator it = line->branches.begin (); it != line->branches.end (); it++) ix += output_branch_count (f, ix, (*it)); } @@ -2825,7 +2825,7 @@ output_function_details (FILE *f, const function_info *fn) if (!flag_branches) return; - arc_t *arc = fn->blocks[EXIT_BLOCK].pred; + arc_info *arc = fn->blocks[EXIT_BLOCK].pred; gcov_type return_count = fn->blocks[EXIT_BLOCK].count; gcov_type called_count = fn->blocks[ENTRY_BLOCK].count;