aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Novillo <dnovillo@google.com>2009-07-14 20:45:05 +0000
committerDiego Novillo <dnovillo@google.com>2009-07-14 20:45:05 +0000
commit2ae18e94310656c611eefb0b22180e1256501072 (patch)
tree97bcbf26e0e74a35ebcfec33fa7e9b78751ed419
parentf938fe49336cd23c85ccc632e84fd382669e8851 (diff)
* lto-cgraph.c (lto_output_edge): Do not stream
EDGE->COUNT inside a bitpack. (input_edge): Corresponding changes. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/lto@149642 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog.lto6
-rw-r--r--gcc/lto-cgraph.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/gcc/ChangeLog.lto b/gcc/ChangeLog.lto
index b4803f70e38..0e89c7a767f 100644
--- a/gcc/ChangeLog.lto
+++ b/gcc/ChangeLog.lto
@@ -1,5 +1,11 @@
2009-07-14 Diego Novillo <dnovillo@google.com>
+ * lto-cgraph.c (lto_output_edge): Do not stream
+ EDGE->COUNT inside a bitpack.
+ (input_edge): Corresponding changes.
+
+2009-07-14 Diego Novillo <dnovillo@google.com>
+
Mainline merge @149625.
* configure.ac (ACX_PKGVERSION): Update revision merge string.
diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c
index 9749015a7ce..899e111892f 100644
--- a/gcc/lto-cgraph.c
+++ b/gcc/lto-cgraph.c
@@ -148,11 +148,12 @@ lto_output_edge (struct lto_simple_output_block *ob, struct cgraph_edge *edge,
gcc_assert (ref != LCC_NOT_FOUND);
lto_output_sleb128_stream (ob->main_stream, ref);
+ lto_output_sleb128_stream (ob->main_stream, edge->count);
+
bp = bitpack_create ();
uid = flag_wpa ? edge->lto_stmt_uid : gimple_uid (edge->call_stmt);
bp_pack_value (bp, uid, HOST_BITS_PER_INT);
bp_pack_value (bp, edge->inline_failed, HOST_BITS_PER_INT);
- bp_pack_value (bp, edge->count, HOST_BITS_PER_WIDEST_INT);
bp_pack_value (bp, edge->frequency, HOST_BITS_PER_INT);
bp_pack_value (bp, edge->loop_nest, 30);
bp_pack_value (bp, edge->indirect_call, 1);
@@ -521,11 +522,12 @@ input_edge (struct lto_input_block *ib, VEC(cgraph_node_ptr, heap) *nodes)
caller_resolution = lto_symtab_get_resolution (caller->decl);
+ count = (gcov_type) lto_input_sleb128 (ib);
+
bp = lto_input_bitpack (ib);
stmt_id = (unsigned int) bp_unpack_value (bp, HOST_BITS_PER_INT);
inline_failed = (cgraph_inline_failed_t) bp_unpack_value (bp,
HOST_BITS_PER_INT);
- count = (gcov_type) bp_unpack_value (bp, HOST_BITS_PER_WIDEST_INT);
freq = (int) bp_unpack_value (bp, HOST_BITS_PER_INT);
nest = (unsigned) bp_unpack_value (bp, 30);