From e7b5f0c9b4aa73a1de50162ae18101dab4f86ce4 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Sat, 3 May 2003 16:43:17 +0000 Subject: [PATCH] trans.c (tree_transform): Use location_t and input_location directly. * trans.c (tree_transform): Use location_t and input_location directly. (build_unit_elab): Likewise. * utils.c (create_label_decl): Likewise. From-SVN: r66433 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/trans.c | 6 ++---- gcc/ada/utils.c | 3 +-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a4afa6294214..cadce12ca851 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2003-05-03 Nathan Sidwell + + * trans.c (tree_transform): Use location_t and input_location + directly. + (build_unit_elab): Likewise. + * utils.c (create_label_decl): Likewise. + 2003-05-01 Nathan Sidwell * trans.c (tree_transform, build_unit_elab, diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c index 064e543481ea..d14d2372360b 100644 --- a/gcc/ada/trans.c +++ b/gcc/ada/trans.c @@ -2619,8 +2619,7 @@ tree_transform (gnat_node) the body so that the line number notes are written correctly. */ set_lineno (gnat_node, 0); - DECL_SOURCE_FILE (gnu_subprog_decl) = input_filename; - DECL_SOURCE_LINE (gnu_subprog_decl) = input_line; + DECL_SOURCE_LOCATION (gnu_subprog_decl) = input_location; begin_subprog_body (gnu_subprog_decl); set_lineno (gnat_node, 1); @@ -5342,8 +5341,7 @@ build_unit_elab (gnat_unit, body_p, gnu_elab_list) { tree lhs = TREE_PURPOSE (gnu_elab_list); - input_filename = DECL_SOURCE_FILE (lhs); - input_line = DECL_SOURCE_LINE (lhs); + input_location = DECL_SOURCE_LOCATION (lhs); /* If LHS has a padded type, convert it to the unpadded type so the assignment is done properly. */ diff --git a/gcc/ada/utils.c b/gcc/ada/utils.c index e74d5a204392..d57994368e39 100644 --- a/gcc/ada/utils.c +++ b/gcc/ada/utils.c @@ -1663,8 +1663,7 @@ create_label_decl (label_name) DECL_CONTEXT (label_decl) = current_function_decl; DECL_MODE (label_decl) = VOIDmode; - DECL_SOURCE_LINE (label_decl) = input_line; - DECL_SOURCE_FILE (label_decl) = input_filename; + DECL_SOURCE_LOCATION (label_decl) = input_location; return label_decl; }