From 282c3fdc47dafe3bead2991d54e8a31d409e119d Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Tue, 13 Sep 2005 21:12:57 +0000 Subject: [PATCH] tree.c (annotate_with_file_line): Compare line numbers before file names. * tree.c (annotate_with_file_line): Compare line numbers before file names. From-SVN: r104239 --- gcc/ChangeLog | 5 +++++ gcc/tree.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 39345c89d31..ea56ce6b0fd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-09-13 Volker Reichelt + + * tree.c (annotate_with_file_line): Compare line numbers before + file names. + 2005-09-13 Uros Bizjak PR target/23816 diff --git a/gcc/tree.c b/gcc/tree.c index 448d329d3c8..2227d8ea64c 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -3116,9 +3116,9 @@ annotate_with_file_line (tree node, const char *file, int line) a node with the same information already attached to that node! Just return instead of wasting memory. */ if (EXPR_LOCUS (node) + && EXPR_LINENO (node) == line && (EXPR_FILENAME (node) == file - || ! strcmp (EXPR_FILENAME (node), file)) - && EXPR_LINENO (node) == line) + || !strcmp (EXPR_FILENAME (node), file))) { last_annotated_node = node; return; @@ -3129,9 +3129,9 @@ annotate_with_file_line (tree node, const char *file, int line) than half. */ if (last_annotated_node && EXPR_LOCUS (last_annotated_node) + && EXPR_LINENO (last_annotated_node) == line && (EXPR_FILENAME (last_annotated_node) == file - || ! strcmp (EXPR_FILENAME (last_annotated_node), file)) - && EXPR_LINENO (last_annotated_node) == line) + || !strcmp (EXPR_FILENAME (last_annotated_node), file))) { SET_EXPR_LOCUS (node, EXPR_LOCUS (last_annotated_node)); return; -- 2.30.2