From cc33944a7a4ad12e11ce9e278f028be948189575 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Wed, 24 Mar 1999 22:48:37 +0000
Subject: [PATCH] fold-const.c (make_range): If orig_type is unset, set it as
 soon as we know the type.

        * fold-const.c (make_range): If orig_type is unset, set it as soon
        as we know the type.  Remove now unnecessary set of orig_type for
        conversions.

Co-Authored-By: Jeffrey A Law <law@cygnus.com>

From-SVN: r25959
---
 gcc/ChangeLog    | 7 +++++++
 gcc/fold-const.c | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 43c57969f53..36dee71a4da 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 23 15:45:25 1999  Richard Earnshaw (rearnsha@arm.com)
+			  Jeff Law <law@cygnus.com>
+
+	* fold-const.c (make_range): If orig_type is unset, set it as soon
+	as we know the type.  Remove now unnecessary set of orig_type for
+	conversions.
+
 Wed Mar 24 23:27:25 1999  Mark Elbrecht  <snowball3@usa.net.
 
 	* i386/djgpp.h: Fix typo.
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 4faac0c649c..1e7bd195ab4 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3140,6 +3140,11 @@ make_range (exp, pin_p, plow, phigh)
 	    arg1 = TREE_OPERAND (exp, 1);
 	}
 
+      /* Set ORIG_TYPE as soon as TYPE is non-null so that we do not
+	 lose a cast by accident.  */
+      if (type != NULL_TREE && orig_type == NULL_TREE)
+	orig_type = type;
+
       switch (code)
 	{
 	case TRUTH_NOT_EXPR:
@@ -3258,8 +3263,6 @@ make_range (exp, pin_p, plow, phigh)
 	  continue;
 
 	case NOP_EXPR:  case NON_LVALUE_EXPR:  case CONVERT_EXPR:
-	  if (orig_type == NULL_TREE)
-	    orig_type = type;
 	  if (TYPE_PRECISION (type) > TYPE_PRECISION (orig_type))
 	    break;
 
-- 
2.30.2