]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Evaluate condition arguments with the correct type.
authorAndrew MacLeod <amacleod@redhat.com>
Mon, 8 Aug 2022 19:13:51 +0000 (15:13 -0400)
committerAndrew MacLeod <amacleod@redhat.com>
Mon, 8 Aug 2022 20:08:51 +0000 (16:08 -0400)
Processing of a cond_expr requires that a range of the correct type for the
operands of the cond_expr is passed in.

PR tree-optimization/106556
gcc/
* gimple-range-gori.cc (gori_compute::condexpr_adjust): Use the
  type of the cond_expr operands being evaluted.

gcc/testsuite/
* gfortran.dg/pr106556.f90: New.

gcc/gimple-range-gori.cc
gcc/testsuite/gfortran.dg/pr106556.f90 [new file with mode: 0644]

index a43e44c841e9152629c79f0811581a3937f90670..8879e44cba11c3736f587621e0aa2b050cf52ddc 100644 (file)
@@ -1398,16 +1398,17 @@ gori_compute::condexpr_adjust (vrange &r1, vrange &r2, gimple *, tree cond,
     }
 
    // Now solve for SSA1 or SSA2 if they are in the dependency chain.
-  Value_Range tmp (type);
    if (ssa1 && in_chain_p (ssa1, cond_name))
     {
-      if (compute_operand_range (tmp, def_stmt, cond_true, ssa1, src))
-       r1.intersect (tmp);
+      Value_Range tmp1 (TREE_TYPE (ssa1));
+      if (compute_operand_range (tmp1, def_stmt, cond_true, ssa1, src))
+       r1.intersect (tmp1);
     }
   if (ssa2 && in_chain_p (ssa2, cond_name))
     {
-      if (compute_operand_range (tmp, def_stmt, cond_false, ssa2, src))
-       r2.intersect (tmp);
+      Value_Range tmp2 (TREE_TYPE (ssa2));
+      if (compute_operand_range (tmp2, def_stmt, cond_false, ssa2, src))
+       r2.intersect (tmp2);
     }
   if (idx)
     {
diff --git a/gcc/testsuite/gfortran.dg/pr106556.f90 b/gcc/testsuite/gfortran.dg/pr106556.f90
new file mode 100644 (file)
index 0000000..01b89a8
--- /dev/null
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! { dg-options "-O1 -fnon-call-exceptions -ftree-loop-if-convert" }
+
+
+program p
+  real :: a(2)
+
+  a(:) = 1.0
+  if (minloc (a, dim = 1).ne.1) STOP 1
+end