diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 356d201..2fd5563 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-06-26 Dehao Chen <dehao@google.com> + + * tree-inline.c: (expand_call_inline): Ensure that lexical block's + source location is consistant with the call stmt. + 2012-06-26 Ulrich Weigand <ulrich.weigand@linaro.org> PR tree-optimization/53729 diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 519cde4..7a8b6a8 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3836,8 +3836,7 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id) /* Set input_location here so we get the right instantiation context if we call instantiate_decl from inlinable_function_p. */ saved_location = input_location; - if (gimple_has_location (stmt)) - input_location = gimple_location (stmt); + input_location = gimple_location (stmt); /* From here on, we're only interested in CALL_EXPRs. */ if (gimple_code (stmt) != GIMPLE_CALL) |