yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcpp: Eliminate most of the non-const/reference-returning inline fns

Browse Source 
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
This commit is contained in:
David Malcolm
2015-05-20 09:13:19 +00:00
committed by David Malcolm
parent 0ff4ddeb59
commit c819ed29b3
5 changed files with 39 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcpp/include/line-map.h
+1 -85
View File
@@ -343,7 +343,7 @@ linemap_check_macro (const line_map *map)
return (const line_map_macro *)map;
}
/* Read the start location of MAP, as an rvalue. */
/* Read the start location of MAP. */
inline source_location
MAP_START_LOCATION (const line_map *map)
@@ -351,15 +351,6 @@ MAP_START_LOCATION (const line_map *map)
return map->start_location;
}
/* Access the start location of MAP as a reference
(e.g. as an lvalue). */
inline source_location&
MAP_START_LOCATION (line_map *map)
{
return map->start_location;
}
/* Get the starting line number of ordinary map MAP. */
inline linenum_type
@@ -368,15 +359,6 @@ ORDINARY_MAP_STARTING_LINE_NUMBER (const line_map_ordinary *ord_map)
return ord_map->to_line;
}
/* Access the starting line number of ordinary map MAP by
reference (e.g. as an lvalue). */
inline linenum_type&
ORDINARY_MAP_STARTING_LINE_NUMBER (line_map_ordinary *ord_map)
{
return ord_map->to_line;
}
/* Get the index of the ordinary map at whose end
ordinary map MAP was included.
@@ -388,14 +370,6 @@ ORDINARY_MAP_INCLUDER_FILE_INDEX (const line_map_ordinary *ord_map)
return ord_map->included_from;
}
/* As above, but by reference (e.g. as an lvalue). */
inline int&
ORDINARY_MAP_INCLUDER_FILE_INDEX (line_map_ordinary *ord_map)
{
return ord_map->included_from;
}
/* Return a positive value if map encodes locations from a system
header, 0 otherwise. Returns 1 if ordinary map MAP encodes locations
in a system header and 2 if it encodes locations in a C system header
@@ -407,14 +381,6 @@ ORDINARY_MAP_IN_SYSTEM_HEADER_P (const line_map_ordinary *ord_map)
return ord_map->sysp;
}
/* As above, but by reference (e.g. as an lvalue). */
inline unsigned char &
ORDINARY_MAP_IN_SYSTEM_HEADER_P (line_map_ordinary *ord_map)
{
return ord_map->sysp;
}
/* Get the number of the low-order source_location bits used for a
column number within ordinary map MAP. */
@@ -424,16 +390,6 @@ ORDINARY_MAP_NUMBER_OF_COLUMN_BITS (const line_map_ordinary *ord_map)
return ord_map->column_bits;
}
/* Set the number of the low-order source_location bits used for a
column number within ordinary map MAP. */
inline void
SET_ORDINARY_MAP_NUMBER_OF_COLUMN_BITS (line_map_ordinary *ord_map,
int col_bits)
{
ord_map->column_bits = col_bits;
}
/* Get the filename of ordinary map MAP. */
inline const char *
@@ -442,14 +398,6 @@ ORDINARY_MAP_FILE_NAME (const line_map_ordinary *ord_map)
return ord_map->to_file;
}
/* As above, but by reference (e.g. as an lvalue). */
inline const char * &
ORDINARY_MAP_FILE_NAME (line_map_ordinary *ord_map)
{
return ord_map->to_file;
}
/* Get the cpp macro whose expansion gave birth to macro map MAP. */
inline cpp_hashnode *
@@ -458,14 +406,6 @@ MACRO_MAP_MACRO (const line_map_macro *macro_map)
return macro_map->macro;
}
/* As above, but by reference (e.g. as an lvalue). */
inline cpp_hashnode * &
MACRO_MAP_MACRO (line_map_macro *macro_map)
{
return macro_map->macro;
}
/* Get the number of tokens inside the replacement-list of the macro
that led to macro map MAP. */
@@ -475,14 +415,6 @@ MACRO_MAP_NUM_MACRO_TOKENS (const line_map_macro *macro_map)
return macro_map->n_tokens;
}
/* As above, but by reference (e.g. as an lvalue). */
inline unsigned int &
MACRO_MAP_NUM_MACRO_TOKENS (line_map_macro *macro_map)
{
return macro_map->n_tokens;
}
/* Get the array of pairs of locations within macro map MAP.
See the declaration of line_map_macro for more information. */
@@ -492,14 +424,6 @@ MACRO_MAP_LOCATIONS (const line_map_macro *macro_map)
return macro_map->macro_locations;
}
/* As above, but by reference (e.g. as an lvalue). */
inline source_location * &
MACRO_MAP_LOCATIONS (line_map_macro *macro_map)
{
return macro_map->macro_locations;
}
/* Get the location of the expansion point of the macro map MAP. */
inline source_location
@@ -508,14 +432,6 @@ MACRO_MAP_EXPANSION_POINT_LOCATION (const line_map_macro *macro_map)
return macro_map->expansion;
}
/* As above, but by reference (e.g. as an lvalue). */
inline source_location &
MACRO_MAP_EXPANSION_POINT_LOCATION (line_map_macro *macro_map)
{
return macro_map->expansion;
}
/* The abstraction of a set of location maps. There can be several
types of location maps. This abstraction contains the attributes
that are independent from the type of the map.