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

2 files changed, 9 insertions, 4 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 39345c8..ea56ce6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-13  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	* tree.c (annotate_with_file_line): Compare line numbers before
+	file names.
+
 2005-09-13  Uros Bizjak  <uros@kss-loka.si>
 
 	PR target/23816
diff --git a/gcc/tree.c b/gcc/tree.c
index 448d329..2227d8e 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;