2012-04-30 Dodji Seketeli <dodji@redhat.com>
+ Make expand_location resolve to locus in main source file
+ * input.c (expand_location_1): New. Takes a parameter to choose
+ whether to resolve the location to spelling or expansion point.
+ Was factorized from ...
+ (expand_location): ... here.
+ (expand_location_to_spelling_point): New. Implemented in terms of
+ expand_location_1.
+ * diagnostic.c (diagnostic_build_prefix): Use the new
+ expand_location_to_spelling_point instead of expand_location.
+
Fix PCH crash on GTYed pointer-to-scalar field of a struct
* gengtype.c (write_types_process_field): Force second argument of
the call to the PCH object hierarchy walker to be 'x'.
"must-not-happen"
};
const char *text = _(diagnostic_kind_text[diagnostic->kind]);
- expanded_location s = expand_location (diagnostic->location);
+ expanded_location s = expand_location_to_spelling_point (diagnostic->location);
if (diagnostic->override_column)
s.column = diagnostic->override_column;
gcc_assert (diagnostic->kind < DK_LAST_DIAGNOSTIC_KIND);
|| diagnostic->location <= BUILTINS_LOCATION)
return;
- s = expand_location(diagnostic->location);
+ s = expand_location_to_spelling_point (diagnostic->location);
line = location_get_source_line (s);
if (line == NULL)
return;
/* Expand the source location LOC into a human readable location. If
LOC resolves to a builtin location, the file name of the readable
- location is set to the string "<built-in>". */
-
-expanded_location
-expand_location (source_location loc)
+ location is set to the string "<built-in>". If EXPANSION_POINT_P is
+ TRUE and LOC is virtual, then it is resolved to the expansion
+ point of the involved macro. Otherwise, it is resolved to the
+ spelling location of the token. */
+
+static expanded_location
+expand_location_1 (source_location loc,
+ bool expansion_point_p)
{
expanded_location xloc;
const struct line_map *map;
loc = linemap_resolve_location (line_table, loc,
- LRK_SPELLING_LOCATION, &map);
+ expansion_point_p
+ ? LRK_MACRO_EXPANSION_POINT
+ : LRK_SPELLING_LOCATION, &map);
xloc = linemap_expand_location (line_table, map, loc);
if (loc <= BUILTINS_LOCATION)
return buffer;
}
+/* Expand the source location LOC into a human readable location. If
+ LOC is virtual, it resolves to the expansion point of the involved
+ macro. If LOC resolves to a builtin location, the file name of the
+ readable location is set to the string "<built-in>". */
+
+expanded_location
+expand_location (source_location loc)
+{
+ return expand_location_1 (loc, /*expansion_point_p=*/true);
+}
+
+/* Expand the source location LOC into a human readable location. If
+ LOC is virtual, it resolves to the expansion location of the
+ relevant macro. If LOC resolves to a builtin location, the file
+ name of the readable location is set to the string
+ "<built-in>". */
+
+expanded_location
+expand_location_to_spelling_point (source_location loc)
+{
+ return expand_location_1 (loc, /*expansion_piont_p=*/false);
+}
+
+
#define ONE_K 1024
#define ONE_M (ONE_K * ONE_K)