From 38056108d00a80cdc2196ea126894159c3410d31 Mon Sep 17 00:00:00 2001
From: vlivanov <unknown>
Date: Tue, 24 May 2016 18:42:01 +0300
Subject: [PATCH] 8154831: CastII/ConvI2L for a range check is prematurely
 eliminated Reviewed-by: kvn, thartmann

---
 src/share/vm/opto/connode.cpp | 6 ++++--
 src/share/vm/opto/subnode.cpp | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/share/vm/opto/connode.cpp b/src/share/vm/opto/connode.cpp
index 00aee5102..3d9924989 100644
--- a/src/share/vm/opto/connode.cpp
+++ b/src/share/vm/opto/connode.cpp
@@ -446,7 +446,9 @@ uint CastIINode::size_of() const {
 }
 
 uint CastIINode::cmp(const Node &n) const {
-  return TypeNode::cmp(n) && ((CastIINode&)n)._carry_dependency == _carry_dependency;
+  return TypeNode::cmp(n) &&
+         ((CastIINode&)n)._carry_dependency == _carry_dependency &&
+         ((CastIINode&)n)._range_check_dependency == _range_check_dependency;
 }
 
 Node *CastIINode::Identity(PhaseTransform *phase) {
@@ -523,7 +525,7 @@ const Type *CastIINode::Value(PhaseTransform *phase) const {
 }
 
 Node *CastIINode::Ideal_DU_postCCP(PhaseCCP *ccp) {
-  if (_carry_dependency) {
+  if (_carry_dependency || _range_check_dependency) {
     return NULL;
   }
   return ConstraintCastNode::Ideal_DU_postCCP(ccp);
diff --git a/src/share/vm/opto/subnode.cpp b/src/share/vm/opto/subnode.cpp
index 1e6c06103..303d333ef 100644
--- a/src/share/vm/opto/subnode.cpp
+++ b/src/share/vm/opto/subnode.cpp
@@ -547,8 +547,12 @@ const Type *CmpUNode::sub( const Type *t1, const Type *t2 ) const {
     // All unsigned values are LE -1 and GE 0.
     if (lo0 == 0 && hi0 == 0) {
       return TypeInt::CC_LE;            //   0 <= bot
+    } else if ((jint)lo0 == -1 && (jint)hi0 == -1) {
+      return TypeInt::CC_GE;            // -1 >= bot
     } else if (lo1 == 0 && hi1 == 0) {
       return TypeInt::CC_GE;            // bot >= 0
+    } else if ((jint)lo1 == -1 && (jint)hi1 == -1) {
+      return TypeInt::CC_LE;            // bot <= -1
     }
   } else {
     // We can use ranges of the form [lo..hi] if signs are the same.
-- 
GitLab