Merge in trunk.

[thirdparty/gcc.git] / gcc / go / go-gcc.cc

diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc
index 0f3f44b32b8d1bda783df4c40e4e673ba7266b13..45827a08ea2897d6c592f0898e1cb66384a1996c 100644 (file)
--- a/gcc/go/go-gcc.cc
+++ b/gcc/go/go-gcc.cc
@@ -1067,8 +1067,7 @@ Gcc_backend::type_size(Btype* btype)
   if (t == error_mark_node)
     return 1;
   t = TYPE_SIZE_UNIT(t);
-  gcc_assert(TREE_CODE(t) == INTEGER_CST);
-  gcc_assert(TREE_INT_CST_HIGH(t) == 0);
+  gcc_assert(tree_fits_uhwi_p (t));
   unsigned HOST_WIDE_INT val_wide = TREE_INT_CST_LOW(t);
   size_t ret = static_cast<size_t>(val_wide);
   gcc_assert(ret == val_wide);