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/c-family | |
| 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/c-family')
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 83a27c2..cb5b5dc 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2010-10-31 Jason Merrill <jason@redhat.com> + + * c-common.c (conversion_warning, warn_for_collisions_1): Use + EXPR_LOC_OR_HERE. + 2010-10-30 Nicola Pero <nicola.pero@meta-innovation.com> Implemented Objective-C 2.0 @property, @synthesize and @dynamic. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 1b76d74..923c63a 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -1863,8 +1863,7 @@ conversion_warning (tree type, tree expr) int i; const int expr_num_operands = TREE_OPERAND_LENGTH (expr); tree expr_type = TREE_TYPE (expr); - location_t loc = EXPR_HAS_LOCATION (expr) - ? EXPR_LOCATION (expr) : input_location; + location_t loc = EXPR_LOC_OR_HERE (expr); if (!warn_conversion && !warn_sign_conversion) return; @@ -2297,8 +2296,7 @@ warn_for_collisions_1 (tree written, tree writer, struct tlist *list, && (!only_writes || list->writer)) { warned_ids = new_tlist (warned_ids, written, NULL_TREE); - warning_at (EXPR_HAS_LOCATION (writer) - ? EXPR_LOCATION (writer) : input_location, + warning_at (EXPR_LOC_OR_HERE (writer), OPT_Wsequence_point, "operation on %qE may be undefined", list->expr); } |