diff options
| author | Jason Merrill <jason@redhat.com> | 2010-10-31 22:04:39 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-10-31 22:04:39 -0400 |
| commit | ec52b1115dda4b0e38aa5620b0c3914b69008a24 (patch) | |
| tree | c668c63e9650ae10b834fb88da25c23030215504 /gcc/builtins.c | |
| parent | 202be748c9997016f1b08c98291db4b7b9b02a5f (diff) | |
| download | gcc-ec52b1115dda4b0e38aa5620b0c3914b69008a24.zip gcc-ec52b1115dda4b0e38aa5620b0c3914b69008a24.tar.gz gcc-ec52b1115dda4b0e38aa5620b0c3914b69008a24.tar.bz2 | |
tree.h (EXPR_LOC_OR_HERE): New macro.
* tree.h (EXPR_LOC_OR_HERE): New macro.
* builtins.c (c_strlen): Use it.
* c-decl.c (build_enumerator): Likewise.
* gimplify.c (internal_get_tmp_var): Likewise.
(shortcut_cond_expr): Likewise.
(gimplify_one_sizepos): Likewise.
c-family/
* c-common.c (conversion_warning, warn_for_collisions_1): Use
EXPR_LOC_OR_HERE.
cp/
* decl.c (pop_switch): Use EXPR_LOC_OR_HERE.
* typeck.c (convert_for_assignment): Likewise.
From-SVN: r166123
Diffstat (limited to 'gcc/builtins.c')
| -rw-r--r-- | gcc/builtins.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/builtins.c b/gcc/builtins.c index 611b777..ced2fa7 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -506,10 +506,7 @@ c_strlen (tree src, int only_value) && (only_value || !TREE_SIDE_EFFECTS (TREE_OPERAND (src, 0)))) return c_strlen (TREE_OPERAND (src, 1), only_value); - if (EXPR_HAS_LOCATION (src)) - loc = EXPR_LOCATION (src); - else - loc = input_location; + loc = EXPR_LOC_OR_HERE (src); src = string_constant (src, &offset_node); if (src == 0) |