From c819ed29b303e42538112e20232de09714bb2a2f Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 20 May 2015 09:13:19 +0000 Subject: libcpp: Eliminate most of the non-const/reference-returning inline fns gcc/java/ChangeLog: * jcf-parse.c (set_source_filename): Replace write through ORDINARY_MAP_FILE_NAME with direct access to "to_file". libcpp/ChangeLog: * include/line-map.h (MAP_START_LOCATION): Eliminate the non-const variant, and tweak comment for the const variant. (ORDINARY_MAP_STARTING_LINE_NUMBER): Drop the non-const variant. (ORDINARY_MAP_INCLUDER_FILE_INDEX): Likewise. (ORDINARY_MAP_IN_SYSTEM_HEADER_P): Likewise. (SET_ORDINARY_MAP_NUMBER_OF_COLUMN_BITS): Delete. (ORDINARY_MAP_FILE_NAME): Drop the non-const variant. (MACRO_MAP_MACRO): Likewise. (MACRO_MAP_NUM_MACRO_TOKENS): Likewise. (MACRO_MAP_LOCATIONS): Likewise. (MACRO_MAP_EXPANSION_POINT_LOCATION): Likewise. * line-map.c (linemap_add): Replace writes through macros with direct field accesses. (linemap_enter_macro): Likewise. (linemap_line_start): Likewise. From-SVN: r223435 --- gcc/java/ChangeLog | 5 +++++ gcc/java/jcf-parse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 9ebc248..4e26aef 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2015-05-20 David Malcolm + + * jcf-parse.c (set_source_filename): Replace write through + ORDINARY_MAP_FILE_NAME with direct access to "to_file". + 2015-04-18 Trevor Saunders * jcf-io.c: Adjust for hash_table changes. diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index e609331..d1c9fc4 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -374,7 +374,7 @@ set_source_filename (JCF *jcf, int index) } sfname = find_sourcefile (sfname); - ORDINARY_MAP_FILE_NAME (LINEMAPS_LAST_ORDINARY_MAP (line_table)) = sfname; + LINEMAPS_LAST_ORDINARY_MAP (line_table)->to_file = sfname; if (current_class == main_class) main_input_filename = sfname; } -- cgit v1.1