Re: [PATCH] options: fix cl_target_option_print_diff() with strings

Re: [PATCH] options: fix cl_target_option_print_diff() with strings

[Jonathan Wakely]

Changing CC to gcc-patches instead of gcc-bugs ...

On 24/01/23 04:14 +0000, Eric Biggers wrote:
>Fix an obvious copy-and-paste error where ptr1 was used instead of ptr2.
>This bug caused the dump file produced by -fdump-ipa-inline-details to
>not correctly show the difference in target options when a function
>could not be inlined due to a target option mismatch.
>
>gcc/ChangeLog:
>
>	* optc-save-gen.awk: Fix copy-and-paste error.
>
>Fixes: b54ecc769f59 ("re PR bootstrap/90543 (Build failure on MINGW for gcc-9.1.0)")
>Signed-off-by: Eric Biggers <ebiggers@google.com>
>---
> gcc/optc-save-gen.awk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk
>index e91adf7f132..d2cb53c477f 100644
>--- a/gcc/optc-save-gen.awk
>+++ b/gcc/optc-save-gen.awk
>@@ -1013,7 +1013,7 @@ for (i = 0; i < n_target_string; i++) {
> 	print "             indent, \"\",";
> 	print "             \"" name "\",";
> 	print "             ptr1->x_" name " ? ptr1->x_" name " : \"(null)\",";
>-	print "             ptr2->x_" name " ? ptr1->x_" name " : \"(null)\");";
>+	print "             ptr2->x_" name " ? ptr2->x_" name " : \"(null)\");";
> 	print "";
> }
>
>-- 
>2.39.1.405.gd4c25cc71f-goog
>

Re: [PATCH] options: fix cl_target_option_print_diff() with strings

[Jakub Jelinek]

On Tue, Jan 24, 2023 at 10:37:43AM +0000, Jonathan Wakely wrote:
> Changing CC to gcc-patches instead of gcc-bugs ...

The fix is obvious, so I've committed it.  Thanks.

> On 24/01/23 04:14 +0000, Eric Biggers wrote:
> > Fix an obvious copy-and-paste error where ptr1 was used instead of ptr2.
> > This bug caused the dump file produced by -fdump-ipa-inline-details to
> > not correctly show the difference in target options when a function
> > could not be inlined due to a target option mismatch.

Though, if you have a small reproducer, it would be nice to include it
in GCC testsuite.

> > 
> > gcc/ChangeLog:
> > 
> > 	* optc-save-gen.awk: Fix copy-and-paste error.
> > 
> > Fixes: b54ecc769f59 ("re PR bootstrap/90543 (Build failure on MINGW for gcc-9.1.0)")

The above line doesn't belong here, instead PR bootstrap/90543 should be
above the * optc-save-gen.awk ... line.

> > Signed-off-by: Eric Biggers <ebiggers@google.com>
> > ---
> > gcc/optc-save-gen.awk | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/gcc/optc-save-gen.awk b/gcc/optc-save-gen.awk
> > index e91adf7f132..d2cb53c477f 100644
> > --- a/gcc/optc-save-gen.awk
> > +++ b/gcc/optc-save-gen.awk
> > @@ -1013,7 +1013,7 @@ for (i = 0; i < n_target_string; i++) {
> > 	print "             indent, \"\",";
> > 	print "             \"" name "\",";
> > 	print "             ptr1->x_" name " ? ptr1->x_" name " : \"(null)\",";
> > -	print "             ptr2->x_" name " ? ptr1->x_" name " : \"(null)\");";
> > +	print "             ptr2->x_" name " ? ptr2->x_" name " : \"(null)\");";
> > 	print "";
> > }
> > 
> > -- 
> > 2.39.1.405.gd4c25cc71f-goog
> > 

	Jakub