From 059345ce40dc68e771f4e38c64597bbe56194551 Mon Sep 17 00:00:00 2001 From: Bernd Schmidt Date: Wed, 9 Jul 2014 10:34:40 +0000 Subject: [PATCH] Avoid using create_tmp_var for static decls. * trans-array.c (gfc_build_constant_array_constructor): Build a static decl manually. * trans-decl.c (create_main_function): Likewise. From-SVN: r212388 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-array.c | 6 +++++- gcc/fortran/trans-decl.c | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4d9f0c3ce26..daf0040fb7c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2014-07-09 Bernd Schmidt + + * trans-array.c (gfc_build_constant_array_constructor): Build a + static decl manually. + * trans-decl.c (create_main_function): Likewise. + 2014-07-07 Paul Thomas PR fortran/61459 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 0e018991c0a..c30318a7c20 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -2045,11 +2045,15 @@ gfc_build_constant_array_constructor (gfc_expr * expr, tree type) TREE_CONSTANT (init) = 1; TREE_STATIC (init) = 1; - tmp = gfc_create_var (tmptype, "A"); + tmp = build_decl (input_location, VAR_DECL, create_tmp_var_name ("A"), + tmptype); + DECL_ARTIFICIAL (tmp) = 1; + DECL_IGNORED_P (tmp) = 1; TREE_STATIC (tmp) = 1; TREE_CONSTANT (tmp) = 1; TREE_READONLY (tmp) = 1; DECL_INITIAL (tmp) = init; + pushdecl (tmp); return tmp; } diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 93c59b11b66..00ac010878a 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -5383,11 +5383,16 @@ create_main_function (tree fndecl) TREE_STATIC (array) = 1; /* Create a static variable to hold the jump table. */ - var = gfc_create_var (array_type, "options"); + var = build_decl (input_location, VAR_DECL, + create_tmp_var_name ("options"), + array_type); + DECL_ARTIFICIAL (var) = 1; + DECL_IGNORED_P (var) = 1; TREE_CONSTANT (var) = 1; TREE_STATIC (var) = 1; TREE_READONLY (var) = 1; DECL_INITIAL (var) = array; + pushdecl (var); var = gfc_build_addr_expr (build_pointer_type (integer_type_node), var); tmp = build_call_expr_loc (input_location,