public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Andrew Macleod <amacleod@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-1995] Evaluate condition arguments with the correct type.
Date: Mon,  8 Aug 2022 20:44:18 +0000 (GMT)	[thread overview]
Message-ID: <20220808204418.2413D3857023@sourceware.org> (raw)

https://gcc.gnu.org/g:ef623bb58594958a7959f8f031f65a50eb0e5890

commit r13-1995-gef623bb58594958a7959f8f031f65a50eb0e5890
Author: Andrew MacLeod <amacleod@redhat.com>
Date:   Mon Aug 8 15:13:51 2022 -0400

    Evaluate condition arguments with the correct type.
    
    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.

Diff:
---
 gcc/gimple-range-gori.cc               | 11 ++++++-----
 gcc/testsuite/gfortran.dg/pr106556.f90 | 10 ++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gcc/gimple-range-gori.cc b/gcc/gimple-range-gori.cc
index a43e44c841e..8879e44cba1 100644
--- a/gcc/gimple-range-gori.cc
+++ b/gcc/gimple-range-gori.cc
@@ -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
index 00000000000..01b89a8eee2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr106556.f90
@@ -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


                 reply	other threads:[~2022-08-08 20:44 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220808204418.2413D3857023@sourceware.org \
    --to=amacleod@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).