diff options
| author | Bernd Schmidt <bernds@codesourcery.com> | 2014-07-15 14:30:44 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2014-07-15 14:30:44 +0000 |
| commit | c99c885ee1169c193554bba2c5dc98c542a8b54d (patch) | |
| tree | 7d0c27e4bf445b51eb64d42bafe3f7fc5cd571b4 | |
| parent | 441f96ff9ecfedea6c6f13959ab0b5984b685d42 (diff) | |
| download | gcc-c99c885ee1169c193554bba2c5dc98c542a8b54d.zip gcc-c99c885ee1169c193554bba2c5dc98c542a8b54d.tar.gz gcc-c99c885ee1169c193554bba2c5dc98c542a8b54d.tar.bz2 | |
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.
From-SVN: r212564
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/asan.c | 2 | ||||
| -rw-r--r-- | 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 <bernds@codesourcery.com> + + * 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 <matz@suse.de> PR rtl-optimization/61772 @@ -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; } |