Work around GCC 6.3.1 bug

This commit works around a GCC 6.3.1 bug several people are hitting:

  https://sourceware.org/ml/gdb-patches/2017-09/msg00270.html
  https://sourceware.org/ml/gdb-patches/2017-10/msg00418.html

It manifests like this:

  ../../../binutils-gdb/gdb/probe.c:68:12: error: types may not be defined in a for-range-declaration [-Werror]
	 for (struct probe *probe : probes)
	      ^~~~~~

Fix it by renaming the range-for named variables to something different
from their type's name.

gdb/ChangeLog:
2017-10-16  Pedro Alves  <palves@redhat.com>

	* elfread.c (probe_key_free): Rename range-for variable.
	* probe.c (parse_probes_in_pspace, find_probes_in_objfile)
	(find_probe_by_pc, collect_probes): Rename range-for variable.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1f72a2494556ee753983f22dbf0674a5201ea7f5..cc81af8ee6e061b6e5d4225ac2b938008f4f48d6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-16  Pedro Alves  <palves@redhat.com>
+
+       * elfread.c (probe_key_free): Rename range-for variable.
+       * probe.c (parse_probes_in_pspace, find_probes_in_objfile)
+       (find_probe_by_pc, collect_probes): Rename range-for variable.
+
 2017-10-16  Yao Qi  <yao.qi@linaro.org>
 
        * features/Makefile (XMLTOC): Remove tic6x-*.xml.

diff --git a/gdb/elfread.c b/gdb/elfread.c
index 436d9b5b4acb587f6069eab047a837f445f467dd..4e110716c3bf46a722bff3b1e49b92eaba2fc32c 100644 (file)
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1340,8 +1340,8 @@ probe_key_free (bfd *abfd, void *d)
 {
   std::vector<probe *> *probes = (std::vector<probe *> *) d;
 
-  for (struct probe *probe : *probes)
-    probe->pops->destroy (probe);
+  for (probe *p : *probes)
+    p->pops->destroy (p);
 
   delete probes;
 }

diff --git a/gdb/probe.c b/gdb/probe.c
index b3dbf896b95bd77b98e8978899f5a2c793e2bd13..eb6f537bf2305cd8b5b5cfe2c5916255fd235f2b 100644 (file)
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -65,23 +65,23 @@ parse_probes_in_pspace (const struct probe_ops *probe_ops,
       const std::vector<probe *> &probes
        = objfile->sf->sym_probe_fns->sym_get_probes (objfile);
 
-      for (struct probe *probe : probes)
+      for (probe *p : probes)
        {
-         if (probe_ops != &probe_ops_any && probe->pops != probe_ops)
+         if (probe_ops != &probe_ops_any && p->pops != probe_ops)
            continue;
 
-         if (provider && strcmp (probe->provider, provider) != 0)
+         if (provider && strcmp (p->provider, provider) != 0)
            continue;
 
-         if (strcmp (probe->name, name) != 0)
+         if (strcmp (p->name, name) != 0)
            continue;
 
          symtab_and_line sal;
-         sal.pc = get_probe_address (probe, objfile);
+         sal.pc = get_probe_address (p, objfile);
          sal.explicit_pc = 1;
          sal.section = find_pc_overlay (sal.pc);
          sal.pspace = search_pspace;
-         sal.probe = probe;
+         sal.probe = p;
          sal.objfile = objfile;
 
          result->push_back (std::move (sal));
@@ -210,15 +210,15 @@ find_probes_in_objfile (struct objfile *objfile, const char *provider,
 
   const std::vector<probe *> &probes
     = objfile->sf->sym_probe_fns->sym_get_probes (objfile);
-  for (struct probe *probe : probes)
+  for (probe *p : probes)
     {
-      if (strcmp (probe->provider, provider) != 0)
+      if (strcmp (p->provider, provider) != 0)
        continue;
 
-      if (strcmp (probe->name, name) != 0)
+      if (strcmp (p->name, name) != 0)
        continue;
 
-      VEC_safe_push (probe_p, result, probe);
+      VEC_safe_push (probe_p, result, p);
     }
 
   return result;
@@ -244,11 +244,11 @@ find_probe_by_pc (CORE_ADDR pc)
     /* If this proves too inefficient, we can replace with a hash.  */
     const std::vector<probe *> &probes
       = objfile->sf->sym_probe_fns->sym_get_probes (objfile);
-    for (struct probe *probe : probes)
-      if (get_probe_address (probe, objfile) == pc)
+    for (probe *p : probes)
+      if (get_probe_address (p, objfile) == pc)
        {
          result.objfile = objfile;
-         result.probe = probe;
+         result.probe = p;
          return result;
        }
   }
@@ -294,20 +294,20 @@ collect_probes (const std::string &objname, const std::string &provider,
       const std::vector<probe *> &probes
        = objfile->sf->sym_probe_fns->sym_get_probes (objfile);
 
-      for (struct probe *probe : probes)
+      for (probe *p : probes)
        {
-         if (pops != NULL && probe->pops != pops)
+         if (pops != NULL && p->pops != pops)
            continue;
 
          if (prov_pat
-             && prov_pat->exec (probe->provider, 0, NULL, 0) != 0)
+             && prov_pat->exec (p->provider, 0, NULL, 0) != 0)
            continue;
 
          if (probe_pat
-             && probe_pat->exec (probe->name, 0, NULL, 0) != 0)
+             && probe_pat->exec (p->name, 0, NULL, 0) != 0)
            continue;
 
-         result.emplace_back (probe, objfile);
+         result.emplace_back (p, objfile);
        }
     }