--- a/gcc/dbgcnt.c	Thu Oct 25 08:08:40 2018 +0900
+++ b/gcc/dbgcnt.c	Thu Oct 25 10:21:07 2018 +0900
@@ -1,5 +1,5 @@
 /* Debug counter for debugging support
-   Copyright (C) 2006-2017 Free Software Foundation, Inc.
+   Copyright (C) 2006-2018 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -41,53 +41,84 @@
 #undef DEBUG_COUNTER
 
 #define DEBUG_COUNTER(a) UINT_MAX,
-static unsigned int limit[debug_counter_number_of_counters] =
+static unsigned int limit_high[debug_counter_number_of_counters] =
 {
 #include "dbgcnt.def"
 };
 #undef DEBUG_COUNTER
 
+static unsigned int limit_low[debug_counter_number_of_counters];
+
 static unsigned int count[debug_counter_number_of_counters];
 
 bool
 dbg_cnt_is_enabled (enum debug_counter index)
 {
-  return count[index] <= limit[index];
+  unsigned v = count[index];
+  return v > limit_low[index] && v <= limit_high[index];
 }
 
 bool
 dbg_cnt (enum debug_counter index)
 {
   count[index]++;
-  if (dump_file && count[index] == limit[index])
-    fprintf (dump_file, "***dbgcnt: limit reached for %s.***\n",
-	     map[index].name);
+
+  if (dump_file)
+    {
+      /* Do not print the info for default lower limit.  */
+      if (count[index] == limit_low[index] && limit_low[index] > 0)
+	fprintf (dump_file, "***dbgcnt: lower limit %d reached for %s.***\n",
+		 limit_low[index], map[index].name);
+      else if (count[index] == limit_high[index])
+	fprintf (dump_file, "***dbgcnt: upper limit %d reached for %s.***\n",
+		 limit_high[index], map[index].name);
+    }
 
   return dbg_cnt_is_enabled (index);
 }
 
-
 static void
-dbg_cnt_set_limit_by_index (enum debug_counter index, int value)
+dbg_cnt_set_limit_by_index (enum debug_counter index, int low, int high)
 {
-  limit[index] = value;
+  limit_low[index] = low;
+  limit_high[index] = high;
 
-  fprintf (stderr, "dbg_cnt '%s' set to %d\n", map[index].name, value);
+  fprintf (stderr, "dbg_cnt '%s' set to %d-%d\n", map[index].name, low, high);
 }
 
 static bool
-dbg_cnt_set_limit_by_name (const char *name, int len, int value)
+dbg_cnt_set_limit_by_name (const char *name, int low, int high)
 {
+  if (high < low)
+    {
+      error ("-fdbg-cnt=%s:%d:%d has smaller upper limit than the lower",
+	     name, low, high);
+      return false;
+    }
+
+  if (low < 0)
+    {
+      error ("Lower limit %d of -fdbg-cnt=%s must be a non-negative number", low,
+	     name);
+      return false;
+    }
+
+  if (high < 0)
+    {
+      error ("Upper limit %d of -fdbg-cnt=%s must be a non-negative number", high,
+	     name);
+      return false;
+    }
+
   int i;
   for (i = debug_counter_number_of_counters - 1; i >= 0; i--)
-    if (strncmp (map[i].name, name, len) == 0
-        && map[i].name[len] == '\0')
+    if (strcmp (map[i].name, name) == 0)
       break;
 
   if (i < 0)
     return false;
 
-  dbg_cnt_set_limit_by_index ((enum debug_counter) i, value);
+  dbg_cnt_set_limit_by_index ((enum debug_counter) i, low, high);
   return true;
 }
 
@@ -96,42 +127,53 @@
    Returns NULL if there's no valid pair is found.
    Otherwise returns a pointer to the end of the pair. */
 
-static const char *
+static bool
 dbg_cnt_process_single_pair (const char *arg)
 {
-   const char *colon = strchr (arg, ':');
-   char *endptr = NULL;
-   int value;
+  char *str = xstrdup (arg);
+  char *name = strtok (str, ":");
+  char *value1 = strtok (NULL, ":");
+  char *value2 = strtok (NULL, ":");
 
-   if (colon == NULL)
-     return NULL;
+  int high, low;
+
+  if (value1 == NULL)
+    return false;
 
-   value = strtol (colon + 1, &endptr, 10);
+  if (value2 == NULL)
+    {
+      low = 0;
+      high = strtol (value1, NULL, 10);
+    }
+  else
+    {
+      low = strtol (value1, NULL, 10);
+      high = strtol (value2, NULL, 10);
+    }
 
-   if (endptr != NULL && endptr != colon + 1
-       && dbg_cnt_set_limit_by_name (arg, colon - arg, value))
-     return endptr;
-
-   return NULL;
+   return dbg_cnt_set_limit_by_name (name, low, high);
 }
 
 void
 dbg_cnt_process_opt (const char *arg)
 {
-   const char *start = arg;
-   const char *next;
+  char *str = xstrdup (arg);
+  const char *next = strtok (str, ",");
+  unsigned int start = 0;
+
    do {
-     next = dbg_cnt_process_single_pair (arg);
-     if (next == NULL)
+     if (!dbg_cnt_process_single_pair (arg))
        break;
-   } while (*next == ',' && (arg = next + 1));
+     start += strlen (arg) + 1;
+     next = strtok (NULL, ",");
+   } while (next != NULL);
 
-   if (next == NULL || *next != 0)
+   if (next != NULL)
      {
-       char *buffer = XALLOCAVEC (char, arg - start + 2);
-       sprintf (buffer, "%*c", (int)(1 + (arg - start)), '^');
+       char *buffer = XALLOCAVEC (char, start + 2);
+       sprintf (buffer, "%*c", start + 1, '^');
        error ("cannot find a valid counter:value pair:");
-       error ("-fdbg-cnt=%s", start);
+       error ("-fdbg-cnt=%s", next);
        error ("          %s", buffer);
      }
 }
@@ -142,10 +184,11 @@
 dbg_cnt_list_all_counters (void)
 {
   int i;
-  printf ("  %-30s %-5s %-5s\n", "counter name",  "limit", "value");
-  printf ("----------------------------------------------\n");
+  printf ("  %-32s %-11s %-12s\n", "counter name",  "low limit",
+	  "high limit");
+  printf ("-----------------------------------------------------------------\n");
   for (i = 0; i < debug_counter_number_of_counters; i++)
-    printf ("  %-30s %5d %5u\n",
-            map[i].name, limit[map[i].counter], count[map[i].counter]);
+    printf ("  %-30s %11u %12u\n",
+	    map[i].name, limit_low[map[i].counter], limit_high[map[i].counter]);
   printf ("\n");
 }