From b24f65cddd02f22d6ae7f3d7a89904fe3041b9ae Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Fri, 15 May 1998 17:32:40 +0000 Subject: Patch from Alex Petit-Bianco. * expr.c (expand_expr, case EXPR_WITH_FILE_LOCATION): Save/restore input_filename and lineno around expand_expr call. Set them to values in WFL before expand_expr call. From-SVN: r19778 --- gcc/expr.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gcc/expr.c') diff --git a/gcc/expr.c b/gcc/expr.c index dcbde15..34f744d 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -5171,9 +5171,20 @@ expand_expr (exp, target, tmode, modifier) return TREE_CST_RTL (exp); case EXPR_WITH_FILE_LOCATION: - if (EXPR_WFL_EMIT_LINE_NOTE (exp)) - emit_line_note (EXPR_WFL_FILENAME (exp), EXPR_WFL_LINENO (exp)); - return expand_expr (EXPR_WFL_NODE (exp), target, tmode, modifier); + { + rtx to_return; + char *saved_input_filename = input_filename; + int saved_lineno = lineno; + input_filename = EXPR_WFL_FILENAME (exp); + lineno = EXPR_WFL_LINENO (exp); + if (EXPR_WFL_EMIT_LINE_NOTE (exp)) + emit_line_note (input_filename, lineno); + /* Possibly avoid switching back and force here */ + to_return = expand_expr (EXPR_WFL_NODE (exp), target, tmode, modifier); + input_filename = saved_input_filename; + lineno = saved_lineno; + return to_return; + } case SAVE_EXPR: context = decl_function_context (exp); -- cgit v1.1