diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c8d46901c9f..b63fe897fdd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-09  Tom Tromey  <tromey@adacore.com>
+
+	* ada-lang.c (remove_extra_symbols): Do not increment when
+	removing an element
+
 2020-09-08  Tom Tromey  <tromey@adacore.com>
 
 	* gdb_bfd.c (gdb_bfd_open): Call bfd_fopen when fstat fails.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index e405cd23d21..f13866ed58f 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5047,8 +5047,8 @@ remove_extra_symbols (std::vector<struct block_symbol> *syms)
       
       if (remove_p)
 	syms->erase (syms->begin () + i);
-
-      i += 1;
+      else
+	i += 1;
     }
 
   /* If all the remaining symbols are identical enumerals, then