diff mbox series

Fix small regression in Ada

Message ID 3481520.iIbC2pHGDl@fomalhaut
State Repeat Merge
Headers
Series Fix small regression in Ada |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Eric Botcazou Feb. 14, 2023, 12:42 p.m. UTC 
  It is present on the mainline and 12 branch and comes from Andrew P. and me 
forgetting about the VOID_TYPE_P case of SAVE_EXPRs.

Tested on x86-64/Linux, applied on mainline and 12 branch as obvious.


2023-02-14  Eric Botcazou  <ebotcazou@adacore.com>

gcc/
	* gimplify.cc (gimplify_save_expr): Add missing guard.

gcc/ada/
	* gcc-interface/trans.cc (gnat_gimplify_expr): Add missing guard.


2023-02-14  Eric Botcazou  <ebotcazou@adacore.com>

	* gnat.dg/shift2.adb: New test.
diff mbox series

Patch

diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc
index 28e3867d142..5fc1a26fede 100644
--- a/gcc/ada/gcc-interface/trans.cc
+++ b/gcc/ada/gcc-interface/trans.cc
@@ -9049,7 +9049,9 @@  gnat_gimplify_expr (tree *expr_p, gimple_seq *pre_p,
 
       /* Propagate TREE_NO_WARNING from expression to temporary by using the
 	 SAVE_EXPR itself as an intermediate step.  See gimplify_save_expr.  */
-      if (SAVE_EXPR_RESOLVED_P (expr))
+      if (type == void_type_node)
+	;
+      else if (SAVE_EXPR_RESOLVED_P (expr))
 	TREE_NO_WARNING (op) = TREE_NO_WARNING (expr);
       else
 	TREE_NO_WARNING (expr) = TREE_NO_WARNING (op);
diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc
index 1b362dd83e3..96845154a92 100644
--- a/gcc/gimplify.cc
+++ b/gcc/gimplify.cc
@@ -6441,7 +6441,7 @@  gimplify_save_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
   gcc_assert (TREE_CODE (*expr_p) == SAVE_EXPR);
   val = TREE_OPERAND (*expr_p, 0);
 
-  if (TREE_TYPE (val) == error_mark_node)
+  if (val && TREE_TYPE (val) == error_mark_node)
     return GS_ERROR;
 
   /* If the SAVE_EXPR has not been resolved, then evaluate it once.  */