From b181d0ea7f38062d5e27a7ed78fc008c156b7576 Mon Sep 17 00:00:00 2001 From: bernds Date: Tue, 15 Jul 2014 14:30:44 +0000 Subject: [PATCH] Change an assignment to an assert. * asan.c (asan_finish_file): Use varpool_finalize_decl instead of varpool_assemble_decl. * varpool.c (varpool_assemble_decl): Assert that node->definition is true. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212564 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/asan.c | 2 +- gcc/varpool.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f777188..1b7b273 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-07-15 Bernd Schmidt + + * asan.c (asan_finish_file): Use varpool_finalize_decl instead of + varpool_assemble_decl. + * varpool.c (varpool_assemble_decl): Assert that node->definition is + true. + 2014-07-15 Michael Matz PR rtl-optimization/61772 diff --git a/gcc/asan.c b/gcc/asan.c index b9a4a91..0d78634 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -2595,7 +2595,7 @@ asan_finish_file (void) TREE_CONSTANT (ctor) = 1; TREE_STATIC (ctor) = 1; DECL_INITIAL (var) = ctor; - varpool_assemble_decl (varpool_node_for_decl (var)); + varpool_finalize_decl (var); fn = builtin_decl_implicit (BUILT_IN_ASAN_REGISTER_GLOBALS); tree gcount_tree = build_int_cst (pointer_sized_int_node, gcount); diff --git a/gcc/varpool.c b/gcc/varpool.c index b98fc1b..04ce714 100644 --- a/gcc/varpool.c +++ b/gcc/varpool.c @@ -541,7 +541,7 @@ varpool_assemble_decl (varpool_node *node) varpool_get_constructor (node); assemble_variable (decl, 0, 1, 0); gcc_assert (TREE_ASM_WRITTEN (decl)); - node->definition = true; + gcc_assert (node->definition); assemble_aliases (node); return true; } -- 2.7.4