[04/17] Fix calc_op1 for undefined op2_range.

Message ID dc2b47bd-57ab-e9bf-50b0-cbdf89f976da@redhat.com
State New
Headers
Series Move builtin functions to range-ops. |

Commit Message

Andrew MacLeod Sept. 22, 2022, 6:58 p.m. UTC
  Unary operations pass the type of operand 1 into op1_range.  If that 
range is undefined, the routine blindly picks the type of operand 
2,which in the case of a unary op, does not exist and traps.

Bootstrapped on x86_64-pc-linux-gnu with no regressions.  Pushed.

Andrew
  

Patch

From a7a6649f4e7c459a95dee1600554ad06aaeb1cf6 Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacleod@redhat.com>
Date: Thu, 22 Sep 2022 10:27:17 -0400
Subject: [PATCH 04/17] Fix calc_op1 for undefined op2_range.

Unary operations pass the type of operand 1 into op1_range.  If that
range is undefined, the routine blindly picks the type of operand 2,
which in the case of a unary op, does not exist and traps.

	* gimple-range-op.cc (gimple_range_op_handler::calc_op1): Use
	  operand 1 for second range if there is no operand 2.
---
 gcc/gimple-range-op.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc
index f03125a0fc5..ab5b389449d 100644
--- a/gcc/gimple-range-op.cc
+++ b/gcc/gimple-range-op.cc
@@ -208,10 +208,14 @@  gimple_range_op_handler::calc_op1 (vrange &r, const vrange &lhs_range,
   // If op2 is undefined, solve as if it is varying.
   if (op2_range.undefined_p ())
     {
-      // This is sometimes invoked on single operand stmts.
       if (gimple_num_ops (m_stmt) < 3)
 	return false;
-      tree op2_type = TREE_TYPE (operand2 ());
+      tree op2_type;
+      // This is sometimes invoked on single operand stmts.
+      if (operand2 ())
+	op2_type = TREE_TYPE (operand2 ());
+      else
+	op2_type = TREE_TYPE (operand1 ());
       Value_Range trange (op2_type);
       trange.set_varying (op2_type);
       return op1_range (r, type, lhs_range, trange);
-- 
2.37.3