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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7771885b9e4654db0b09b2e3969f3b4a280d3fb..1b7b273cd510c121e914331056a7f63dea6f6698 100644 (file)
--- 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

diff --git a/gcc/asan.c b/gcc/asan.c
index b9a4a911d640e522a9a1c29e84054e8ff09f80ce..0d786349d92724a07a3120f5b9d887267b8eb453 100644 (file)
--- 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 b98fc1b44f4255db608b30de4fd36db8eec114fa..04ce71412f1824ad38d0dc86cd09b66a3f8eb619 100644 (file)
--- 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;
     }