diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb
index 2231b9c77742..76f08e3619bf 100644
--- a/gcc/ada/exp_dbug.adb
+++ b/gcc/ada/exp_dbug.adb
@@ -1028,6 +1028,7 @@ package body Exp_Dbug is
       E := First_Entity (Wrapper);
       while Present (E) loop
          if Nkind (Parent (E)) = N_Object_Declaration
+           and then Present (Corresponding_Generic_Association (Parent (E)))
            and then Is_Elementary_Type (Etype (E))
          then
             Loc := Sloc (Expression (Parent (E)));
diff --git a/gcc/ada/exp_dbug.ads b/gcc/ada/exp_dbug.ads
index 0c0dd1a0b0ff..273d6eded93c 100644
--- a/gcc/ada/exp_dbug.ads
+++ b/gcc/ada/exp_dbug.ads
@@ -1444,7 +1444,7 @@ package Exp_Dbug is
    --  placed within the wrapper package of the instance, and the entity in
    --  these declarations is encoded in a complex way that GDB does not handle
    --  well. These new renaming declarations appear within the body of the
-   --  subprogram, and are redundant from a visibility point of view, but They
+   --  subprogram, and are redundant from a visibility point of view, but they
    --  should have no measurable performance impact, and require no special
    --  decoding in the debugger.