Merge from trunk.

[thirdparty/gcc.git] / gcc / fortran / trans-decl.c

diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index eea058145047447d68fd27783ddff87a9d2bac7e..e201d854dbdb936cd481a6bf54a446fe065ff8d3 100644 (file)
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -25,8 +25,12 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "stringpool.h"
+#include "stor-layout.h"
+#include "varasm.h"
+#include "attribs.h"
 #include "tree-dump.h"
-#include "gimple.h"    /* For create_tmp_var_raw.  */
+#include "gimple-expr.h"       /* For create_tmp_var_raw.  */
 #include "ggc.h"
 #include "diagnostic-core.h"   /* For internal_error.  */
 #include "toplev.h"    /* For announce_function.  */
@@ -408,7 +412,7 @@ gfc_can_put_var_on_stack (tree size)
   if (!cst_fits_uhwi_p (size))
     return 0;
 
-  low = tree_to_hwi (size);
+  low = TREE_INT_CST_LOW (size);
   if (low > (unsigned HOST_WIDE_INT) gfc_option.flag_max_stack_var_size)
     return 0;