diff options
Diffstat (limited to 'gcc/fortran/trans-decl.c')
| -rw-r--r-- | gcc/fortran/trans-decl.c | 101 |
1 files changed, 64 insertions, 37 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index a491c0b..c647e92 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -203,7 +203,8 @@ gfc_build_label_decl (tree label_id) label_name = NULL; /* Build the LABEL_DECL node. Labels have no type. */ - label_decl = build_decl (LABEL_DECL, label_id, void_type_node); + label_decl = build_decl (input_location, + LABEL_DECL, label_id, void_type_node); DECL_CONTEXT (label_decl) = current_function_decl; DECL_MODE (label_decl) = VOIDmode; @@ -750,7 +751,8 @@ gfc_build_qualified_array (tree decl, gfc_symbol * sym) DECL_IGNORED_P (GFC_TYPE_ARRAY_UBOUND (type, dim)) = 0; } } - TYPE_NAME (type) = type_decl = build_decl (TYPE_DECL, NULL, gtype); + TYPE_NAME (type) = type_decl = build_decl (input_location, + TYPE_DECL, NULL, gtype); DECL_ORIGINAL_TYPE (type_decl) = gtype; } } @@ -842,7 +844,8 @@ gfc_build_dummy_array_decl (gfc_symbol * sym, tree dummy) } ASM_FORMAT_PRIVATE_NAME (name, IDENTIFIER_POINTER (DECL_NAME (dummy)), 0); - decl = build_decl (VAR_DECL, get_identifier (name), type); + decl = build_decl (input_location, + VAR_DECL, get_identifier (name), type); DECL_ARTIFICIAL (decl) = 1; TREE_PUBLIC (decl) = 0; @@ -892,7 +895,7 @@ gfc_nonlocal_dummy_array_decl (gfc_symbol *sym) return; dummy = GFC_DECL_SAVED_DESCRIPTOR (sym->backend_decl); - decl = build_decl (VAR_DECL, DECL_NAME (dummy), + decl = build_decl (input_location, VAR_DECL, DECL_NAME (dummy), TREE_TYPE (sym->backend_decl)); DECL_ARTIFICIAL (decl) = 0; TREE_USED (decl) = 1; @@ -926,7 +929,8 @@ gfc_create_string_length (gfc_symbol * sym) /* Also prefix the mangled name. */ strcpy (&name[1], sym->name); name[0] = '.'; - length = build_decl (VAR_DECL, get_identifier (name), + length = build_decl (input_location, + VAR_DECL, get_identifier (name), gfc_charlen_type_node); DECL_ARTIFICIAL (length) = 1; TREE_USED (length) = 1; @@ -955,9 +959,11 @@ gfc_add_assign_aux_vars (gfc_symbol * sym) decl = sym->backend_decl; gfc_allocate_lang_decl (decl); GFC_DECL_ASSIGN (decl) = 1; - length = build_decl (VAR_DECL, create_tmp_var_name (sym->name), + length = build_decl (input_location, + VAR_DECL, create_tmp_var_name (sym->name), gfc_charlen_type_node); - addr = build_decl (VAR_DECL, create_tmp_var_name (sym->name), + addr = build_decl (input_location, + VAR_DECL, create_tmp_var_name (sym->name), pvoid_type_node); gfc_finish_var_decl (length, sym); gfc_finish_var_decl (addr, sym); @@ -1079,9 +1085,8 @@ gfc_get_symbol_decl (gfc_symbol * sym) length = gfc_create_string_length (sym); /* Create the decl for the variable. */ - decl = build_decl (VAR_DECL, gfc_sym_identifier (sym), gfc_sym_type (sym)); - - gfc_set_decl_location (decl, &sym->declared_at); + decl = build_decl (sym->declared_at.lb->location, + VAR_DECL, gfc_sym_identifier (sym), gfc_sym_type (sym)); /* Symbols from modules should have their assembler names mangled. This is done here rather than in gfc_finish_var_decl because it @@ -1150,7 +1155,8 @@ gfc_get_symbol_decl (gfc_symbol * sym) { tree span; GFC_DECL_SUBREF_ARRAY_P (decl) = 1; - span = build_decl (VAR_DECL, create_tmp_var_name ("span"), + span = build_decl (input_location, + VAR_DECL, create_tmp_var_name ("span"), gfc_array_index_type); gfc_finish_var_decl (span, sym); TREE_STATIC (span) = TREE_STATIC (decl); @@ -1222,7 +1228,8 @@ get_proc_pointer_decl (gfc_symbol *sym) if (decl) return decl; - decl = build_decl (VAR_DECL, get_identifier (sym->name), + decl = build_decl (input_location, + VAR_DECL, get_identifier (sym->name), build_pointer_type (gfc_get_function_type (sym))); if ((sym->ns->proc_name @@ -1380,7 +1387,8 @@ gfc_get_extern_function_decl (gfc_symbol * sym) } type = gfc_get_function_type (sym); - fndecl = build_decl (FUNCTION_DECL, name, type); + fndecl = build_decl (input_location, + FUNCTION_DECL, name, type); SET_DECL_ASSEMBLER_NAME (fndecl, mangled_name); /* If the return type is a pointer, avoid alias issues by setting @@ -1461,7 +1469,8 @@ build_function_decl (gfc_symbol * sym) == NAMESPACE_DECL); type = gfc_get_function_type (sym); - fndecl = build_decl (FUNCTION_DECL, gfc_sym_identifier (sym), type); + fndecl = build_decl (input_location, + FUNCTION_DECL, gfc_sym_identifier (sym), type); /* Perform name mangling if this is a top level or module procedure. */ if (current_function_decl == NULL_TREE) @@ -1505,7 +1514,8 @@ build_function_decl (gfc_symbol * sym) type = void_type_node; } - result_decl = build_decl (RESULT_DECL, result_decl, type); + result_decl = build_decl (input_location, + RESULT_DECL, result_decl, type); DECL_ARTIFICIAL (result_decl) = 1; DECL_IGNORED_P (result_decl) = 1; DECL_CONTEXT (result_decl) = fndecl; @@ -1578,7 +1588,8 @@ create_function_arglist (gfc_symbol * sym) if (sym->attr.entry_master) { type = TREE_VALUE (typelist); - parm = build_decl (PARM_DECL, get_identifier ("__entry"), type); + parm = build_decl (input_location, + PARM_DECL, get_identifier ("__entry"), type); DECL_CONTEXT (parm) = fndecl; DECL_ARG_TYPE (parm) = type; @@ -1600,7 +1611,8 @@ create_function_arglist (gfc_symbol * sym) tree len_type = TREE_VALUE (TREE_CHAIN (typelist)); gcc_assert (len_type == gfc_charlen_type_node); - length = build_decl (PARM_DECL, + length = build_decl (input_location, + PARM_DECL, get_identifier (".__result"), len_type); if (!sym->ts.cl->length) @@ -1622,7 +1634,8 @@ create_function_arglist (gfc_symbol * sym) if (sym->ts.cl->backend_decl == NULL) { - tree len = build_decl (VAR_DECL, + tree len = build_decl (input_location, + VAR_DECL, get_identifier ("..__result"), gfc_charlen_type_node); DECL_ARTIFICIAL (len) = 1; @@ -1642,7 +1655,8 @@ create_function_arglist (gfc_symbol * sym) } } - parm = build_decl (PARM_DECL, get_identifier ("__result"), type); + parm = build_decl (input_location, + PARM_DECL, get_identifier ("__result"), type); DECL_CONTEXT (parm) = fndecl; DECL_ARG_TYPE (parm) = TREE_VALUE (typelist); @@ -1684,7 +1698,8 @@ create_function_arglist (gfc_symbol * sym) strcpy (&name[1], f->sym->name); name[0] = '_'; - length = build_decl (PARM_DECL, get_identifier (name), len_type); + length = build_decl (input_location, + PARM_DECL, get_identifier (name), len_type); hidden_arglist = chainon (hidden_arglist, length); DECL_CONTEXT (length) = fndecl; @@ -1739,7 +1754,8 @@ create_function_arglist (gfc_symbol * sym) type = build_pointer_type (type); /* Build the argument declaration. */ - parm = build_decl (PARM_DECL, gfc_sym_identifier (f->sym), type); + parm = build_decl (input_location, + PARM_DECL, gfc_sym_identifier (f->sym), type); /* Fill in arg stuff. */ DECL_CONTEXT (parm) = fndecl; @@ -1929,7 +1945,8 @@ build_entry_thunks (gfc_namespace * ns) tree union_decl, field; tree master_type = TREE_TYPE (ns->proc_name->backend_decl); - union_decl = build_decl (VAR_DECL, get_identifier ("__result"), + union_decl = build_decl (input_location, + VAR_DECL, get_identifier ("__result"), TREE_TYPE (master_type)); DECL_ARTIFICIAL (union_decl) = 1; DECL_EXTERNAL (union_decl) = 0; @@ -2144,10 +2161,12 @@ gfc_get_fake_result_decl (gfc_symbol * sym, int parent_flag) IDENTIFIER_POINTER (DECL_NAME (this_function_decl))); if (!sym->attr.mixed_entry_master && sym->attr.function) - decl = build_decl (VAR_DECL, get_identifier (name), + decl = build_decl (input_location, + VAR_DECL, get_identifier (name), gfc_sym_type (sym)); else - decl = build_decl (VAR_DECL, get_identifier (name), + decl = build_decl (input_location, + VAR_DECL, get_identifier (name), TREE_TYPE (TREE_TYPE (this_function_decl))); DECL_ARTIFICIAL (decl) = 1; DECL_EXTERNAL (decl) = 0; @@ -2207,7 +2226,8 @@ gfc_build_library_function_decl (tree name, tree rettype, int nargs, ...) /* Build the function type and decl. */ fntype = build_function_type (rettype, arglist); - fndecl = build_decl (FUNCTION_DECL, name, fntype); + fndecl = build_decl (input_location, + FUNCTION_DECL, name, fntype); /* Mark this decl as external. */ DECL_EXTERNAL (fndecl) = 1; @@ -2888,7 +2908,7 @@ gfc_init_default_dt (gfc_symbol * sym, tree body) { present = gfc_conv_expr_present (sym); tmp = build3 (COND_EXPR, TREE_TYPE (tmp), present, - tmp, build_empty_stmt ()); + tmp, build_empty_stmt (input_location)); } gfc_add_expr_to_block (&fnblock, tmp); gfc_free_expr (e); @@ -2923,7 +2943,7 @@ init_intent_out_dt (gfc_symbol * proc_sym, tree body) present = gfc_conv_expr_present (f->sym); tmp = build3 (COND_EXPR, TREE_TYPE (tmp), present, - tmp, build_empty_stmt ()); + tmp, build_empty_stmt (input_location)); gfc_add_expr_to_block (&fnblock, tmp); } @@ -3311,7 +3331,8 @@ gfc_trans_use_stmts (gfc_namespace * ns) if (entry->namespace_decl == NULL) { entry->namespace_decl - = build_decl (NAMESPACE_DECL, + = build_decl (input_location, + NAMESPACE_DECL, get_identifier (use_stmt->module_name), void_type_node); DECL_EXTERNAL (entry->namespace_decl) = 1; @@ -3488,7 +3509,8 @@ gfc_emit_parameter_debug_info (gfc_symbol *sym) return; /* Create the decl for the variable or constant. */ - decl = build_decl (sym->attr.flavor == FL_PARAMETER ? CONST_DECL : VAR_DECL, + decl = build_decl (input_location, + sym->attr.flavor == FL_PARAMETER ? CONST_DECL : VAR_DECL, gfc_sym_identifier (sym), gfc_sym_type (sym)); if (sym->attr.flavor == FL_PARAMETER) TREE_READONLY (decl) = 1; @@ -3875,7 +3897,8 @@ create_main_function (tree fndecl) build_pointer_type (pchar_type_node), NULL_TREE); main_identifier_node = get_identifier ("main"); - ftn_main = build_decl (FUNCTION_DECL, main_identifier_node, tmp); + ftn_main = build_decl (input_location, FUNCTION_DECL, + main_identifier_node, tmp); DECL_EXTERNAL (ftn_main) = 0; TREE_PUBLIC (ftn_main) = 1; TREE_STATIC (ftn_main) = 1; @@ -3883,7 +3906,8 @@ create_main_function (tree fndecl) = tree_cons (get_identifier("externally_visible"), NULL_TREE, NULL_TREE); /* Setup the result declaration (for "return 0"). */ - result_decl = build_decl (RESULT_DECL, NULL_TREE, integer_type_node); + result_decl = build_decl (input_location, + RESULT_DECL, NULL_TREE, integer_type_node); DECL_ARTIFICIAL (result_decl) = 1; DECL_IGNORED_P (result_decl) = 1; DECL_CONTEXT (result_decl) = ftn_main; @@ -3897,7 +3921,7 @@ create_main_function (tree fndecl) typelist = TYPE_ARG_TYPES (TREE_TYPE (ftn_main)); tmp = TREE_VALUE (typelist); - argc = build_decl (PARM_DECL, get_identifier ("argc"), tmp); + argc = build_decl (input_location, PARM_DECL, get_identifier ("argc"), tmp); DECL_CONTEXT (argc) = ftn_main; DECL_ARG_TYPE (argc) = TREE_VALUE (typelist); TREE_READONLY (argc) = 1; @@ -3906,7 +3930,7 @@ create_main_function (tree fndecl) typelist = TREE_CHAIN (typelist); tmp = TREE_VALUE (typelist); - argv = build_decl (PARM_DECL, get_identifier ("argv"), tmp); + argv = build_decl (input_location, PARM_DECL, get_identifier ("argv"), tmp); DECL_CONTEXT (argv) = ftn_main; DECL_ARG_TYPE (argv) = TREE_VALUE (typelist); TREE_READONLY (argv) = 1; @@ -4354,10 +4378,12 @@ gfc_generate_constructors (void) type = build_function_type (void_type_node, gfc_chainon_list (NULL_TREE, void_type_node)); - fndecl = build_decl (FUNCTION_DECL, fnname, type); + fndecl = build_decl (input_location, + FUNCTION_DECL, fnname, type); TREE_PUBLIC (fndecl) = 1; - decl = build_decl (RESULT_DECL, NULL_TREE, void_type_node); + decl = build_decl (input_location, + RESULT_DECL, NULL_TREE, void_type_node); DECL_ARTIFICIAL (decl) = 1; DECL_IGNORED_P (decl) = 1; DECL_CONTEXT (decl) = fndecl; @@ -4378,7 +4404,7 @@ gfc_generate_constructors (void) for (; gfc_static_ctors; gfc_static_ctors = TREE_CHAIN (gfc_static_ctors)) { tmp = build_call_expr (TREE_VALUE (gfc_static_ctors), 0); - DECL_SAVED_TREE (fndecl) = build_stmt (EXPR_STMT, tmp); + DECL_SAVED_TREE (fndecl) = build_stmt (input_location, EXPR_STMT, tmp); } decl = getdecls (); @@ -4426,7 +4452,8 @@ gfc_generate_block_data (gfc_namespace * ns) else id = get_identifier ("__BLOCK_DATA__"); - decl = build_decl (VAR_DECL, id, gfc_array_index_type); + decl = build_decl (input_location, + VAR_DECL, id, gfc_array_index_type); TREE_PUBLIC (decl) = 1; TREE_STATIC (decl) = 1; DECL_IGNORED_P (decl) = 1; |