diff options
| author | Richard Guenther <rguenther@suse.de> | 2011-12-19 15:57:02 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2011-12-19 15:57:02 +0000 |
| commit | 7e54c6084da692073648d73aaa36dc06f562abc7 (patch) | |
| tree | 16b996c2025405cb5a936807037ff9de2de2ece6 /gcc/streamer-hooks.h | |
| parent | 23a3541f271216b1a518ecb6f713500b76949172 (diff) | |
| download | gcc-7e54c6084da692073648d73aaa36dc06f562abc7.zip gcc-7e54c6084da692073648d73aaa36dc06f562abc7.tar.gz gcc-7e54c6084da692073648d73aaa36dc06f562abc7.tar.bz2 | |
re PR lto/51573 (ICE (segfault) in lto_varpool_encoder_encode_initializer_p)
2011-12-19 Richard Guenther <rguenther@suse.de>
PR lto/51573
* streamer-hooks.h (struct streamer_hooks): Add second
ref_p parameter to write_tree.
(stream_write_tree): Adjust.
(stream_write_tree_shallow_non_ref): New define.
* lto-streamer.h (lto_output_tree): Adjust.
* lto-streamer-out.c (lto_output_tree): Likewise.
* tree-streamer-out.c (streamer_write_chain): Only
force the immediate tree to be streamed as non-reference.
* gcc.dg/lto/20111207-2_0.c: Adjust.
* g++.dg/lto/pr51573-1_0.C: New testcase.
From-SVN: r182487
Diffstat (limited to 'gcc/streamer-hooks.h')
| -rw-r--r-- | gcc/streamer-hooks.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/streamer-hooks.h b/gcc/streamer-hooks.h index 0c1d483..d23d130 100644 --- a/gcc/streamer-hooks.h +++ b/gcc/streamer-hooks.h @@ -41,9 +41,10 @@ struct streamer_hooks { a tree node. The arguments are: output_block where to write the node, the tree node to write and a boolean flag that should be true if the caller wants to write a reference to the tree, instead of the - tree itself. The referencing mechanism is up to each streamer to - implement. */ - void (*write_tree) (struct output_block *, tree, bool); + tree itself. The second boolean parameter specifies this for + the tree itself, the first for all siblings that are streamed. + The referencing mechanism is up to each streamer to implement. */ + void (*write_tree) (struct output_block *, tree, bool, bool); /* [REQ] Called by every tree streaming routine that needs to read a tree node. It takes two arguments: an lto_input_block pointing @@ -64,7 +65,10 @@ struct streamer_hooks { }; #define stream_write_tree(OB, EXPR, REF_P) \ - streamer_hooks.write_tree(OB, EXPR, REF_P) + streamer_hooks.write_tree(OB, EXPR, REF_P, REF_P) + +#define stream_write_tree_shallow_non_ref(OB, EXPR, REF_P) \ + streamer_hooks.write_tree(OB, EXPR, REF_P, false) #define stream_read_tree(IB, DATA_IN) \ streamer_hooks.read_tree(IB, DATA_IN) |