[PATCH] [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh

[PATCH] [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh

[Tom de Vries]

Hi,

The -m option of cc-with-tweaks.sh sets want_multi to true, invoking dwz like
this:
...
elif [ "$want_multi" = true ]; then
    cp $output_file ${output_file}.alt
    $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt \
        > /dev/null 2>&1
fi
...

The problem that is being solved here, is that we want to test dwz in
multifile mode, which requires more than one input file, while we only have
(at the scope of cc-with-tweaks.sh) one executable.  We handle this by copying
the executable and offering this as a second input (and using a copy has the
additional benefit that it maximally enables dwz transformation).

However, after the dwz invocation, the copy is no longer used, and the
presence of the file actually causes a test regression:
...
FAIL: gdb.base/jit-so.exp: test jit-reader-load filename completion
...

Fix this by removing the superflous copy after dwz invocation.

Tested on x86_64-linux.

OK for trunk?

Thanks,
- Tom

[gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh

gdb/ChangeLog:

2019-04-11  Tom de Vries  <tdevries@suse.de>

	PR gdb/24438
	* contrib/cc-with-tweaks.sh: Remove superfluous .alt file after dwz
	invocation.

---
 gdb/contrib/cc-with-tweaks.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh
index f6bfa16565..33c6322138 100755
--- a/gdb/contrib/cc-with-tweaks.sh
+++ b/gdb/contrib/cc-with-tweaks.sh
@@ -180,6 +180,7 @@ if [ "$want_dwz" = true ]; then
 elif [ "$want_multi" = true ]; then
     cp $output_file ${output_file}.alt
     $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt > /dev/null 2>&1
+    rm -f ${output_file}.alt
 fi
 
 if [ "$want_dwp" = true ]; then

[committed] [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh

[Tom de Vries]

Committed as obvious.

Thanks,
- Tom

On 11-04-19 12:26, Tom de Vries wrote:
> Hi,
> 
> The -m option of cc-with-tweaks.sh sets want_multi to true, invoking dwz like
> this:
> ...
> elif [ "$want_multi" = true ]; then
>     cp $output_file ${output_file}.alt
>     $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt \
>         > /dev/null 2>&1
> fi
> ...
> 
> The problem that is being solved here, is that we want to test dwz in
> multifile mode, which requires more than one input file, while we only have
> (at the scope of cc-with-tweaks.sh) one executable.  We handle this by copying
> the executable and offering this as a second input (and using a copy has the
> additional benefit that it maximally enables dwz transformation).
> 
> However, after the dwz invocation, the copy is no longer used, and the
> presence of the file actually causes a test regression:
> ...
> FAIL: gdb.base/jit-so.exp: test jit-reader-load filename completion
> ...
> 
> Fix this by removing the superflous copy after dwz invocation.
> 
> Tested on x86_64-linux.
> 
> OK for trunk?
> 
> Thanks,
> - Tom
> 
> [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh
> 
> gdb/ChangeLog:
> 
> 2019-04-11  Tom de Vries  <tdevries@suse.de>
> 
> 	PR gdb/24438
> 	* contrib/cc-with-tweaks.sh: Remove superfluous .alt file after dwz
> 	invocation.
> 
> ---
>  gdb/contrib/cc-with-tweaks.sh | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh
> index f6bfa16565..33c6322138 100755
> --- a/gdb/contrib/cc-with-tweaks.sh
> +++ b/gdb/contrib/cc-with-tweaks.sh
> @@ -180,6 +180,7 @@ if [ "$want_dwz" = true ]; then
>  elif [ "$want_multi" = true ]; then
>      cp $output_file ${output_file}.alt
>      $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt > /dev/null 2>&1
> +    rm -f ${output_file}.alt
>  fi
>  
>  if [ "$want_dwp" = true ]; then
> 

Re: [PATCH] [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh

[Tom Tromey]

>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:

Tom> Fix this by removing the superflous copy after dwz invocation.

Tom> Tested on x86_64-linux.

Tom> OK for trunk?

Tom> Thanks,
Tom> - Tom

Tom> [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh

Tom> gdb/ChangeLog:

Tom> 2019-04-11  Tom de Vries  <tdevries@suse.de>

Tom> 	PR gdb/24438
Tom> 	* contrib/cc-with-tweaks.sh: Remove superfluous .alt file after dwz
Tom> 	invocation.

Thanks, this is ok.

Tom