[RFA] Fix some gdb.ada tests failures due to naming conflict.

  Fix these by using names that have more chances to be unique.

assign_arr.exp
--------------
The test assign_arr fails (timeout) due to conflict between var 'input' and s-ststop.adb 'input'.
(gdb) print input.u2 := (0.25,0.5,0.75)
Multiple matches for input
[0] cancel
[1] system.strings.stream_ops.storage_array_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return system.storage_elements.storage_array at s-ststop.adb:127
[2] system.strings.stream_ops.stream_element_array_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return ada.streams.stream_element_array at s-ststop.adb:127
[3] system.strings.stream_ops.string_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return string at s-ststop.adb:127
[4] system.strings.stream_ops.wide_string_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return wide_string at s-ststop.adb:127
[5] system.strings.stream_ops.wide_wide_string_ops.input (access ada.streams.root_stream_type; system.strings.stream_ops.io_kind; natural) return wide_wide_string at s-ststop.adb:127
[6] target_wrapper.input at /bd/home/philippe/gdb/git/info_t/gdb/testsuite/gdb.ada/assign_arr/target_wrapper.ads:24
> FAIL: gdb.ada/assign_arr.exp: print input.u2 := (0.25,0.5,0.75) (timeout)

fun_renaming.exp
----------------
The test fun_renaming fails due to conflict between var 'next' and s-pooloc.adb next:
(gdb) print next(1)
Multiple matches for next
[0] cancel
[1] pack.next (integer) return integer at /bd/home/philippe/gdb/git/binutils-gdb/gdb/testsuite/gdb.ada/fun_renaming/pack.adb:19
[2] system.pool_local.next (system.address) return system.pool_local.acc_address at s-pooloc.adb:151
> FAIL: gdb.ada/fun_renaming.exp: print next(1) (timeout)

Fix by making the names and renamings more unique.

packed_array_assign.exp
-----------------------
The test gdb.ada/packed_array_assign fails due to conflict between component 'w'
and system.dim.mks.w:

(gdb) print pra := ((x => 2, y => 0, w => 17), pr, (x => 7, y => 1, w => 23))
Unknown component name: system.dim.mks.w.
(gdb) FAIL: gdb.ada/packed_array_assign.exp: print pra := ((x => 2, y => 0, w => 17), pr, (x => 7, y => 1, w => 23))

Also, the test expected (wrongly as far as I can see) to have the
components printed in the order (w, x, y), while the code defines them
in the order (x, y, w), and the compiler (GNATMAKE 6.3.0,
gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516) respects this order:
for Packed_Rec use record
   Packed_Array_Assign_X at 0 range  0 ..  2;
   Packed_Array_Assign_Y at 0 range  3 ..  5;
   Packed_Array_Assign_W at 0 range  6 .. 37;
end record;

So, update to test the new (more unique) names in the source order.

rename_subscript_param.exp
--------------------------
The test rename_subscript_param.exp fails due to conflict between boolean 'b'
and some 'b' in atnat.h.

(gdb) print b
Multiple matches for b
[0] cancel
[1] b at ../sysdeps/ieee754/dbl-64/atnat.h:106
[2] b at ../sysdeps/ieee754/dbl-64/atnat.h:106
[3] b at ../sysdeps/ieee754/dbl-64/atnat.h:106
> FAIL: gdb.ada/rename_subscript_param.exp: print b before changing its value (timeout)

Fix by renaming 'b' to 'rename_subscript_param_b.
Also, change 'before' to 'after' in the gdb_test message that prints
the value after changing it.
The test however still fails for me, probably because the Debian stable
Ada compiler is too old, and does not properly generate debug info for
this renaming:
(gdb) print rename_subscript_param_b
No definition of "rename_subscript_param_b" in current context.
(gdb) FAIL: gdb.ada/rename_subscript_param.exp: print rename_subscript_param_b before changing its value

2018-12-24  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* gdb.ada/assign_arr/target_wrapper.ads (Input): Rename to
	Assign_Arr_Input.
	main_p324_051.adb: Update accordingly.
	gdb.ada/assign_arr.exp: Likewise.
	* gdb.ada/fun_renaming/pack.ads (Next): Rename to Fun_Rename_Test_Next.
	(Renamed_Next): Rename to Renamed_Fun_Rename_Test_Next.
	gdb.ada/fun_renaming/pack.adb (Next): Rename to Fun_Rename_Test_Next.
	gdb.ada/fun_renaming/fun_renaming.adb (N): Rename to Fun_Rename_Test_N.
	gdb.ada/fun_renaming.exp: Update accordingly.
	* gdb.ada/packed_array_assign/aggregates.ads (Packed_Rec):
	Rename components to Packed_Array_Assign_[X|Y|W].
	gdb.ada/packed_array_assign.exp: Update accordingly.  Use source
	order for checking the component order.
	* gdb.ada/rename_subscript_param/pkg.adb (B): Rename to
	Rename_Subscript_Param_B.
	* gdb.ada/rename_subscript_param.exp: Update accordingly.
---
 gdb/testsuite/gdb.ada/assign_arr.exp               |  2 +-
 gdb/testsuite/gdb.ada/assign_arr/main_p324_051.adb |  2 +-
 .../gdb.ada/assign_arr/target_wrapper.ads          |  2 +-
 gdb/testsuite/gdb.ada/fun_renaming.exp             | 14 +++++++-------
 .../gdb.ada/fun_renaming/fun_renaming.adb          |  7 ++++---
 gdb/testsuite/gdb.ada/fun_renaming/pack.adb        |  4 ++--
 gdb/testsuite/gdb.ada/fun_renaming/pack.ads        |  5 +++--
 gdb/testsuite/gdb.ada/packed_array_assign.exp      |  4 ++--
 .../gdb.ada/packed_array_assign/aggregates.ads     |  8 +++++---
 gdb/testsuite/gdb.ada/rename_subscript_param.exp   |  8 ++++----
 .../gdb.ada/rename_subscript_param/pkg.adb         |  4 ++--
 11 files changed, 32 insertions(+), 28 deletions(-)
  

>>>>> "Philippe" == Philippe Waroquiers <philippe.waroquiers@skynet.be> writes:

>> FAIL: gdb.ada/rename_subscript_param.exp: print b before changing its value (timeout)

Note that this particular one is PR ada/23381, so that should be
mentioned in the ChangeLog.

Tom
  

> Fix these by using names that have more chances to be unique.

Thanks for doing that, Philippe. I believe this is because you are
using a version of the compiler where the entire runtime has debugging
information, which is not AdaCore's normal mode.

Would you mind terribly splitting this commit into a series of coomits,
with one commit per tescase? If you are unsure how to do that with git,
take a look at git reset (and prob. google as well ;-)).

> 
> packed_array_assign.exp
> -----------------------
> The test gdb.ada/packed_array_assign fails due to conflict between component 'w'
> and system.dim.mks.w:
> 
> (gdb) print pra := ((x => 2, y => 0, w => 17), pr, (x => 7, y => 1, w => 23))
> Unknown component name: system.dim.mks.w.
> (gdb) FAIL: gdb.ada/packed_array_assign.exp: print pra := ((x => 2, y => 0, w => 17), pr, (x => 7, y => 1, w => 23))
> 
> Also, the test expected (wrongly as far as I can see) to have the
> components printed in the order (w, x, y), while the code defines them
> in the order (x, y, w), and the compiler (GNATMAKE 6.3.0,
> gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516) respects this order:
> for Packed_Rec use record
>    Packed_Array_Assign_X at 0 range  0 ..  2;
>    Packed_Array_Assign_Y at 0 range  3 ..  5;
>    Packed_Array_Assign_W at 0 range  6 .. 37;
> end record;
> 
> So, update to test the new (more unique) names in the source order.

We have to te be careful about the component order. AdaCore implemented
a change last year where components can be automatically re-ordered
if it makes the code more efficient. One way we can handle this is by
accepting both orders. However, looking at the record, and the purpuse
of the testcase, I think we achieve the same goals by just reordering
the fields in Packed_Rec. That way, the component order chosen by
the compiler remains the same regardless of the compiler.

> rename_subscript_param.exp
> --------------------------
> The test rename_subscript_param.exp fails due to conflict between boolean 'b'
> and some 'b' in atnat.h.
> 
> (gdb) print b
> Multiple matches for b
> [0] cancel
> [1] b at ../sysdeps/ieee754/dbl-64/atnat.h:106
> [2] b at ../sysdeps/ieee754/dbl-64/atnat.h:106
> [3] b at ../sysdeps/ieee754/dbl-64/atnat.h:106
> > FAIL: gdb.ada/rename_subscript_param.exp: print b before changing its value (timeout)
> 
> Fix by renaming 'b' to 'rename_subscript_param_b.
> Also, change 'before' to 'after' in the gdb_test message that prints
> the value after changing it.
> The test however still fails for me, probably because the Debian stable
> Ada compiler is too old, and does not properly generate debug info for
> this renaming:
> (gdb) print rename_subscript_param_b
> No definition of "rename_subscript_param_b" in current context.
> (gdb) FAIL: gdb.ada/rename_subscript_param.exp: print rename_subscript_param_b before changing its value

This renaming is unnecessary. What is probably happening as you guessed
is that the compiler failed to generate the renaming. As a result,
GDB failed to find "B" in the current scope. That's when it started
searching in the static then global scope. The wider search does not
happen if some symbols were found in the current scope, so the
ambiguity you are seeing is only because of the inability to find "B".

You can still rename "B" if you would like, but the only advantage
I can see for doing that is that you get the second error message
(no definition of...) instead of the multiple choice menu in
situations like yours where the compiler failed to generate
the necessary debug info.

> 2018-12-24  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
> 
> 	* gdb.ada/assign_arr/target_wrapper.ads (Input): Rename to
> 	Assign_Arr_Input.
> 	main_p324_051.adb: Update accordingly.

It is already written up, and it is fine as is, so no need to
waste more time on more Changelog writing; but for the future,
you can saveyourself a bit of time by saying...

  	* gdb.ada/assign_arr/target_wrapper.ads (Input): Rename to
  	Assign_Arr_Input. All users updated.

... and that's it!

> 	gdb.ada/assign_arr.exp: Likewise.
> 	* gdb.ada/fun_renaming/pack.ads (Next): Rename to Fun_Rename_Test_Next.
> 	(Renamed_Next): Rename to Renamed_Fun_Rename_Test_Next.
> 	gdb.ada/fun_renaming/pack.adb (Next): Rename to Fun_Rename_Test_Next.
> 	gdb.ada/fun_renaming/fun_renaming.adb (N): Rename to Fun_Rename_Test_N.
> 	gdb.ada/fun_renaming.exp: Update accordingly.
> 	* gdb.ada/packed_array_assign/aggregates.ads (Packed_Rec):
> 	Rename components to Packed_Array_Assign_[X|Y|W].
> 	gdb.ada/packed_array_assign.exp: Update accordingly.  Use source
> 	order for checking the component order.
> 	* gdb.ada/rename_subscript_param/pkg.adb (B): Rename to
> 	Rename_Subscript_Param_B.
> 	* gdb.ada/rename_subscript_param.exp: Update accordingly.
  

Hello Joel,
Thanks for the review comments.

I just submitted an RFAv2 that should handle all below comments.

On Wed, 2018-12-26 at 08:56 +0400, Joel Brobecker wrote:
> > Fix these by using names that have more chances to be unique.
> 
> Thanks for doing that, Philippe. I believe this is because you are
> using a version of the compiler where the entire runtime has debugging
> information, which is not AdaCore's normal mode.
> 
> Would you mind terribly splitting this commit into a series of coomits,
> with one commit per tescase? If you are unsure how to do that with git,
> take a look at git reset (and prob. google as well ;-)).
RFAv2 has now one commit per testcase.

> 
> > 
> > packed_array_assign.exp
> > So, update to test the new (more unique) names in the source order.
> 
> We have to te be careful about the component order. AdaCore implemented
> a change last year where components can be automatically re-ordered
> if it makes the code more efficient. One way we can handle this is by
> accepting both orders. However, looking at the record, and the purpuse
> of the testcase, I think we achieve the same goals by just reordering
> the fields in Packed_Rec. That way, the component order chosen by
> the compiler remains the same regardless of the compiler.
Effectively, gcc 6.3.0 and a recent gnat pro behaved differently.
I have updated the test so that both compilers are giving the same
component order.

> 
> > rename_subscript_param.exp
> > Fix by renaming 'b' to 'rename_subscript_param_b.
...
> This renaming is unnecessary. What is probably happening as you guessed
> is that the compiler failed to generate the renaming. As a result,
> GDB failed to find "B" in the current scope. That's when it started
> searching in the static then global scope. The wider search does not
> happen if some symbols were found in the current scope, so the
> ambiguity you are seeing is only because of the inability to find "B".
> 
> You can still rename "B" if you would like, but the only advantage
> I can see for doing that is that you get the second error message
> (no definition of...) instead of the multiple choice menu in
> situations like yours where the compiler failed to generate
> the necessary debug info.
I have kept the renaming, as this ensures the test fails directly
rather than with a timeout.

> 
> > 2018-12-24  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
> > 
> > 	* gdb.ada/assign_arr/target_wrapper.ads (Input): Rename to
> > 	Assign_Arr_Input.
> > 	main_p324_051.adb: Update accordingly.
> 
> It is already written up, and it is fine as is, so no need to
> waste more time on more Changelog writing; but for the future,
> you can saveyourself a bit of time by saying...
> 
>   	* gdb.ada/assign_arr/target_wrapper.ads (Input): Rename to
>   	Assign_Arr_Input. All users updated.
> 
> ... and that's it!
Any hint making writing ChangeLog less frustrating is good to know :).

Thanks

Philippe
  

On Mon, 2018-12-24 at 13:58 -0700, Tom Tromey wrote:
> > > > > > "Philippe" == Philippe Waroquiers <philippe.waroquiers@skynet.be> writes:
> > > FAIL: gdb.ada/rename_subscript_param.exp: print b before changing its value (timeout)
> 
> Note that this particular one is PR ada/23381, so that should be
> mentioned in the ChangeLog.
Ouch, I forgot to add this in the RFAv2 ChangeLog.
I will add this before pushing.
Philippe
  

On Wed, 2018-12-26 at 15:13 +0100, Philippe Waroquiers wrote:
> On Mon, 2018-12-24 at 13:58 -0700, Tom Tromey wrote:
> > > > > > > "Philippe" == Philippe Waroquiers <philippe.waroquiers@skynet.be> writes:
> > > > 
> > > > FAIL: gdb.ada/rename_subscript_param.exp: print b before changing its value (timeout)
> > 
> > Note that this particular one is PR ada/23381, so that should be
> > mentioned in the ChangeLog.
> 
> Ouch, I forgot to add this in the RFAv2 ChangeLog.
> I will add this before pushing.
Here is the updated ChangeLog:

2018-12-26  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	PR ada/23381
	* gdb.ada/rename_subscript_param/pkg.adb (B): Rename to
	Rename_Subscript_Param_B.  All users updated.
	gdb.ada/rename_subscript_param.exp: Test names made unique.
	Note that PR ada/23381 is only fully fixed when using a recent
	compiler.