[PATCH] ipa/100513 - fix SSA_NAME_DEF_STMT corruption in IPA param manip

[PATCH] ipa/100513 - fix SSA_NAME_DEF_STMT corruption in IPA param manip

[Richard Biener]

This fixes unintended clobbering of SSA_NAME_DEF_STMT of the
cloned/inlined from SSA name during IPA parameter manipulation
of call stmt LHSs.  gimple_call_set_lhs adjusts SSA_NAME_DEF_STMT
of the lhs to the stmt being modified but when
ipa_param_body_adjustments::modify_call_stmt is called the
cloning/inlining process has not yet remapped the stmts operands
to the copy variants but they are still original.

Bootstrapped on x86_64-unknown-linux-gnu, testing in progress.

OK for trunk and branch?

Thanks,
Richard.

2021-05-11  Richard Biener  <rguenther@suse.de>

	PR ipa/100513
	* ipa-param-manipulation.c
	(ipa_param_body_adjustments::modify_call_stmt): Avoid
	altering SSA_NAME_DEF_STMT by adjusting the calls LHS
	via gimple_call_lhs_ptr.
---
 gcc/ipa-param-manipulation.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gcc/ipa-param-manipulation.c b/gcc/ipa-param-manipulation.c
index 1d1e64f546a..f2d91476655 100644
--- a/gcc/ipa-param-manipulation.c
+++ b/gcc/ipa-param-manipulation.c
@@ -1692,7 +1692,9 @@ ipa_param_body_adjustments::modify_call_stmt (gcall **stmt_p)
       if (tree lhs = gimple_call_lhs (stmt))
 	{
 	  modify_expression (&lhs, false);
-	  gimple_call_set_lhs (new_stmt, lhs);
+	  /* Avoid adjusting SSA_NAME_DEF_STMT of a SSA lhs, SSA names
+	     have not yet been remapped.  */
+	  *gimple_call_lhs_ptr (new_stmt) = lhs;
 	}
       *stmt_p = new_stmt;
       return true;
-- 
2.26.2

Re: [PATCH] ipa/100513 - fix SSA_NAME_DEF_STMT corruption in IPA param manip

[Martin Jambor]

Hi,

On Tue, May 11 2021, Richard Biener wrote:
> This fixes unintended clobbering of SSA_NAME_DEF_STMT of the
> cloned/inlined from SSA name during IPA parameter manipulation
> of call stmt LHSs.  gimple_call_set_lhs adjusts SSA_NAME_DEF_STMT
> of the lhs to the stmt being modified but when
> ipa_param_body_adjustments::modify_call_stmt is called the
> cloning/inlining process has not yet remapped the stmts operands
> to the copy variants but they are still original.
>
> Bootstrapped on x86_64-unknown-linux-gnu, testing in progress.
>
> OK for trunk and branch?

Yes, thank you.

Martin


>
> Thanks,
> Richard.
>
> 2021-05-11  Richard Biener  <rguenther@suse.de>
>
> 	PR ipa/100513
> 	* ipa-param-manipulation.c
> 	(ipa_param_body_adjustments::modify_call_stmt): Avoid
> 	altering SSA_NAME_DEF_STMT by adjusting the calls LHS
> 	via gimple_call_lhs_ptr.