Merge in trunk.

[thirdparty/gcc.git] / gcc / asan.c

diff --git a/gcc/asan.c b/gcc/asan.c
index fdca37755a9e4bc0c7162f7bcfb1c9ae643ce319..028c08e0e87e1d7c0c5b59a067d5b8ddc4e8fd8a 100644 (file)
--- a/gcc/asan.c
+++ b/gcc/asan.c
@@ -2024,7 +2024,7 @@ asan_add_global (tree decl, tree type, vec<constructor_elt, va_gc> *v)
   CONSTRUCTOR_APPEND_ELT (vinner, NULL_TREE,
                          fold_convert (const_ptr_type_node,
                                        build_fold_addr_expr (refdecl)));
-  size = tree_low_cst (DECL_SIZE_UNIT (decl), 1);
+  size = tree_to_uhwi (DECL_SIZE_UNIT (decl));
   CONSTRUCTOR_APPEND_ELT (vinner, NULL_TREE, build_int_cst (uptr, size));
   size += asan_red_zone_size (size);
   CONSTRUCTOR_APPEND_ELT (vinner, NULL_TREE, build_int_cst (uptr, size));