* c-ada-spec.c (compare_node): Compare the DECL_UIDs as a last resort.

From-SVN: r271549

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index ae990feeaba2c7d4ea01263ad3f2a3de2b97f988..328effd24db85f0fa008afa39ca882454c477772 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2019-05-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * c-ada-spec.c (compare_node): Compare the DECL_UIDs as a last resort.
+
 2019-05-22  Martin Liska  <mliska@suse.cz>
 
        PR lto/90500

diff --git a/gcc/c-family/c-ada-spec.c b/gcc/c-family/c-ada-spec.c
index dc3a044fd90b4ff45d93ab50629c6c473cb0bd41..45268508f636e291f9cc3e09d4fe023af65490a6 100644 (file)
--- a/gcc/c-family/c-ada-spec.c
+++ b/gcc/c-family/c-ada-spec.c
@@ -679,8 +679,10 @@ compare_node (const void *lp, const void *rp)
 {
   const_tree lhs = *((const tree *) lp);
   const_tree rhs = *((const tree *) rp);
+  const int ret
+    = compare_location (decl_sloc (lhs, true), decl_sloc (rhs, true));
 
-  return compare_location (decl_sloc (lhs, true), decl_sloc (rhs, true));
+  return ret ? ret : DECL_UID (lhs) - DECL_UID (rhs);
 }
 
 /* Compare two comments (LP and RP) by their source location.  */