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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182487
138bc75d-0d04-0410-961f-
82ee72b054a4
+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.
+
2011-12-19 Martin Jambor <mjambor@suse.cz>
PR tree-optimization/51583
/* Emit the physical representation of tree node EXPR to output block
- OB. If REF_P is true, the leaves of EXPR are emitted as references
- via lto_output_tree_ref. */
+ OB. If THIS_REF_P is true, the leaves of EXPR are emitted as references
+ via lto_output_tree_ref. REF_P is used for streaming siblings of EXPR. */
void
-lto_output_tree (struct output_block *ob, tree expr, bool ref_p)
+lto_output_tree (struct output_block *ob, tree expr,
+ bool ref_p, bool this_ref_p)
{
unsigned ix;
bool existed_p;
return;
}
- if (ref_p && tree_is_indexable (expr))
+ if (this_ref_p && tree_is_indexable (expr))
{
lto_output_tree_ref (ob, expr);
return;
extern void lto_register_decl_definition (tree, struct lto_file_decl_data *);
extern struct output_block *create_output_block (enum lto_section_type);
extern void destroy_output_block (struct output_block *);
-extern void lto_output_tree (struct output_block *, tree, bool);
+extern void lto_output_tree (struct output_block *, tree, bool, bool);
extern void lto_output_toplevel_asms (void);
extern void produce_asm (struct output_block *ob, tree fn);
void lto_output_decl_state_streams (struct output_block *,
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
};
#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)
+2011-12-19 Richard Guenther <rguenther@suse.de>
+
+ PR lto/51573
+ * gcc.dg/lto/20111207-2_0.c: Adjust.
+ * g++.dg/lto/pr51573-1_0.C: New testcase.
+
2011-12-19 Jakub Jelinek <jakub@redhat.com>
PR c++/51619
--- /dev/null
+// { dg-lto-do link }
+// { dg-lto-options { { -flto } { -flto -g } } }
+
+struct T
+{
+ virtual void m () { }
+};
+int
+main ()
+{
+ bool fn (T);
+ return 0;
+}
/* { dg-lto-do run } */
+/* { dg-lto-options { { -g -O -flto } } } */
int
test (void)
to the global decls section as we do not want to have them
enter decl merging. This is, of course, only for the call
for streaming BLOCK_VARS, but other callers are safe. */
- stream_write_tree (ob, t,
- ref_p && !(VAR_OR_FUNCTION_DECL_P (t)
- && DECL_EXTERNAL (t)));
+ if (VAR_OR_FUNCTION_DECL_P (t)
+ && DECL_EXTERNAL (t))
+ stream_write_tree_shallow_non_ref (ob, t, ref_p);
+ else
+ stream_write_tree (ob, t, ref_p);
TREE_CHAIN (t) = saved_chain;
t = TREE_CHAIN (t);