Merge from trunk.

[thirdparty/gcc.git] / gcc / lto / lto-lang.c

diff --git a/gcc/lto/lto-lang.c b/gcc/lto/lto-lang.c
index cb15ce32fa7115bd8396a87d152c1d5503a1ddd7..77896adc907b4f8ce2741341d761e663c4c8e36c 100644 (file)
--- a/gcc/lto/lto-lang.c
+++ b/gcc/lto/lto-lang.c
@@ -318,8 +318,7 @@ static bool
 get_nonnull_operand (tree arg_num_expr, unsigned HOST_WIDE_INT *valp)
 {
   /* Verify the arg number is a constant.  */
-  if (TREE_CODE (arg_num_expr) != INTEGER_CST
-      || TREE_INT_CST_HIGH (arg_num_expr) != 0)
+  if (!cst_fits_uhwi_p (arg_num_expr))
     return false;
 
   *valp = TREE_INT_CST_LOW (arg_num_expr);