diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-11 11:19:01 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-11 11:19:01 +0000 |
| commit | 10c7be7ea6e54fc16864f455ffd8e57404b1a467 (patch) | |
| tree | ee70b35cdded91a6e9f721e4c5cbaedad09528ad /gcc/tree-diagnostic.c | |
| parent | d59974987297588b3031ef2f2ae409c5bd858bd0 (diff) | |
| download | gcc-10c7be7ea6e54fc16864f455ffd8e57404b1a467.tar.gz | |
2012-05-11 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 187397 using svnmerge
gimple_seq are disappearing!
[gcc/]
2012-05-11 Basile Starynkevitch <basile@starynkevitch.net>
{{for merge with trunk svn 187397, since gimple_seq are
disappearing in GCC 4.8}}
* melt-runtime.h (melt_gt_ggc_mx_gimple_seq_d): New declaration
(gt_ggc_mx_gimple_seq_d): Macro defined when GCC 4.8 only.
* melt-runtime.c (melt_gt_ggc_mx_gimple_seq_d): New function,
defined for GCC 4.8 only.
* melt/warmelt-debug.melt (melt_debug_fun): Add cast in our
warning diagnostic to avoid a warning.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@187401 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-diagnostic.c')
| -rw-r--r-- | gcc/tree-diagnostic.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/tree-diagnostic.c b/gcc/tree-diagnostic.c index 0a55925fb31..cbdbb778259 100644 --- a/gcc/tree-diagnostic.c +++ b/gcc/tree-diagnostic.c @@ -187,30 +187,30 @@ maybe_unwind_expanded_macro_loc (diagnostic_context *context, LRK_MACRO_DEFINITION_LOCATION, NULL); saved_kind = diagnostic->kind; - saved_prefix = context->printer->prefix; + saved_prefix = pp_get_prefix (context->printer); saved_location = diagnostic->location; diagnostic->kind = DK_NOTE; diagnostic->location = resolved_def_loc; - pp_base_set_prefix (context->printer, - diagnostic_build_prefix (context, - diagnostic)); + pp_set_prefix (context->printer, + diagnostic_build_prefix (context, diagnostic)); pp_newline (context->printer); pp_printf (context->printer, "in expansion of macro '%s'", linemap_map_get_macro_name (iter->map)); pp_destroy_prefix (context->printer); + diagnostic_show_locus (context, diagnostic); diagnostic->location = resolved_exp_loc; - pp_base_set_prefix (context->printer, - diagnostic_build_prefix (context, - diagnostic)); + pp_set_prefix (context->printer, + diagnostic_build_prefix (context, diagnostic)); pp_newline (context->printer); - pp_printf (context->printer, "expanded from here"); + pp_string (context->printer, "expanded from here"); pp_destroy_prefix (context->printer); + diagnostic_show_locus (context, diagnostic); diagnostic->kind = saved_kind; diagnostic->location = saved_location; - context->printer->prefix = saved_prefix; + pp_set_prefix (context->printer, saved_prefix); } VEC_free (loc_map_pair, heap, loc_vec); |