*** old/src/share/vm/opto/mathexactnode.cpp	Mon Feb 10 13:04:44 2014
--- new/src/share/vm/opto/mathexactnode.cpp	Mon Feb 10 13:04:43 2014

*** 29,430 ****
--- 29,252 ----
  #include "opto/machnode.hpp"
  #include "opto/matcher.hpp"
  #include "opto/mathexactnode.hpp"
  #include "opto/subnode.hpp"
  
  MathExactNode::MathExactNode(Node* ctrl, Node* in1) : MultiNode(2) {
    init_class_id(Class_MathExact);
    init_req(0, ctrl);
!   init_req(1, in1);
  }
  
  MathExactNode::MathExactNode(Node* ctrl, Node* in1, Node* in2) : MultiNode(3) {
    init_class_id(Class_MathExact);
    init_req(0, ctrl);
    init_req(1, in1);
    init_req(2, in2);
  }
  
  BoolNode* MathExactNode::bool_node() const {
    Node* flags = flags_node();
    BoolNode* boolnode = flags->unique_out()->as_Bool();
    assert(boolnode != NULL, "must have BoolNode");
    return boolnode;
  }
  
  IfNode* MathExactNode::if_node() const {
    BoolNode* boolnode = bool_node();
    IfNode* ifnode = boolnode->unique_out()->as_If();
    assert(ifnode != NULL, "must have IfNode");
    return ifnode;
  }
  
  Node* MathExactNode::control_node() const {
    IfNode* ifnode = if_node();
    return ifnode->in(0);
  }
  
  Node* MathExactNode::non_throwing_branch() const {
    IfNode* ifnode = if_node();
    if (bool_node()->_test._test == BoolTest::overflow) {
      return ifnode->proj_out(0);
    }
    return ifnode->proj_out(1);
  }
  
  // If the MathExactNode won't overflow we have to replace the
  // FlagsProjNode and ProjNode that is generated by the MathExactNode
  Node* MathExactNode::no_overflow(PhaseGVN* phase, Node* new_result) {
    PhaseIterGVN* igvn = phase->is_IterGVN();
    if (igvn) {
      ProjNode* result = result_node();
      ProjNode* flags = flags_node();
  
      if (result != NULL) {
        igvn->replace_node(result, new_result);
      }
  
      if (flags != NULL) {
        BoolNode* boolnode = bool_node();
        switch (boolnode->_test._test) {
          case BoolTest::overflow:
            // if the check is for overflow - never taken
            igvn->replace_node(boolnode, phase->intcon(0));
            break;
          case BoolTest::no_overflow:
            // if the check is for no overflow - always taken
            igvn->replace_node(boolnode, phase->intcon(1));
            break;
          default:
            fatal("Unexpected value of BoolTest");
            break;
        }
        flags->del_req(0);
      }
    }
    return new_result;
  }
  
  Node* MathExactINode::match(const ProjNode* proj, const Matcher* m) {
    uint ideal_reg = proj->ideal_reg();
    RegMask rm;
    if (proj->_con == result_proj_node) {
      rm = m->mathExactI_result_proj_mask();
    } else {
      assert(proj->_con == flags_proj_node, "must be result or flags");
      assert(ideal_reg == Op_RegFlags, "sanity");
      rm = m->mathExactI_flags_proj_mask();
    }
    return new (m->C) MachProjNode(this, proj->_con, rm, ideal_reg);
  }
  
  Node* MathExactLNode::match(const ProjNode* proj, const Matcher* m) {
    uint ideal_reg = proj->ideal_reg();
    RegMask rm;
    if (proj->_con == result_proj_node) {
      rm = m->mathExactL_result_proj_mask();
    } else {
      assert(proj->_con == flags_proj_node, "must be result or flags");
      assert(ideal_reg == Op_RegFlags, "sanity");
      rm = m->mathExactI_flags_proj_mask();
    }
    return new (m->C) MachProjNode(this, proj->_con, rm, ideal_reg);
  }
  
  Node* AddExactINode::Ideal(PhaseGVN* phase, bool can_reshape) {
    Node* arg1 = in(1);
    Node* arg2 = in(2);
+ template <typename OverflowOp>
+ class AddHelper {
+ public:
!   typedef typename OverflowOp::TypeClass TypeClass;
+   typedef typename TypeClass::NativeType NativeType;
  
    const Type* type1 = phase->type(arg1);
!   const Type* type2 = phase->type(arg2);
  
    if (type1 != Type::TOP && type1->singleton() &&
        type2 != Type::TOP && type2->singleton()) {
      jint val1 = arg1->get_int();
      jint val2 = arg2->get_int();
      jint result = val1 + val2;
+   static bool will_overflow(NativeType value1, NativeType value2) {
!     NativeType result = value1 + value2;
      // Hacker's Delight 2-12 Overflow if both arguments have the opposite sign of the result
!     if ( (((val1 ^ result) & (val2 ^ result)) >= 0)) {
!       Node* con_result = ConINode::make(phase->C, result);
        return no_overflow(phase, con_result);
!     if (((value1 ^ result) & (value2 ^ result)) >= 0) {
!       return false;
      }
!     return NULL;
!     return true;
    }
  
    if (type1 == TypeInt::ZERO || type2 == TypeInt::ZERO) { // (Add 0 x) == x
      Node* add_result = new (phase->C) AddINode(arg1, arg2);
!     return no_overflow(phase, add_result);
+   static bool can_overflow(const Type* type1, const Type* type2) {
+     if (type1 == TypeClass::ZERO || type2 == TypeClass::ZERO) {
!       return false;
      }
  
    if (type2->singleton()) {
      return NULL; // no change - keep constant on the right
+     return true;
    }
+ };
  
    if (type1->singleton()) {
      // Make it x + Constant - move constant to the right
      swap_edges(1, 2);
!     return this;
    }
+ template <typename OverflowOp>
+ class SubHelper {
+ public:
!   typedef typename OverflowOp::TypeClass TypeClass;
+   typedef typename TypeClass::NativeType NativeType;
  
!   if (arg2->is_Load()) {
      return NULL; // no change - keep load on the right
    }
  
!   if (arg1->is_Load()) {
      // Make it x + Load - move load to the right
      swap_edges(1, 2);
      return this;
!   static bool will_overflow(NativeType value1, NativeType value2) {
+     NativeType result = value1 - value2;
+     // hacker's delight 2-12 overflow iff the arguments have different signs and
+     // the sign of the result is different than the sign of arg1
!     if (((value1 ^ value2) & (value1 ^ result)) >= 0) {
+       return false;
      }
  
    if (arg1->_idx > arg2->_idx) {
      // Sort the edges
      swap_edges(1, 2);
      return this;
+     return true;
    }
  
    return NULL;
  }
  
  Node* AddExactLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
    Node* arg1 = in(1);
    Node* arg2 = in(2);
  
    const Type* type1 = phase->type(arg1);
    const Type* type2 = phase->type(arg2);
  
    if (type1 != Type::TOP && type1->singleton() &&
        type2 != Type::TOP && type2->singleton()) {
      jlong val1 = arg1->get_long();
      jlong val2 = arg2->get_long();
      jlong result = val1 + val2;
      // Hacker's Delight 2-12 Overflow if both arguments have the opposite sign of the result
      if ( (((val1 ^ result) & (val2 ^ result)) >= 0)) {
        Node* con_result = ConLNode::make(phase->C, result);
        return no_overflow(phase, con_result);
+   static bool can_overflow(const Type* type1, const Type* type2) {
+     if (type2 == TypeClass::ZERO) {
+       return false;
      }
!     return NULL;
!     return true;
    }
+ };
  
    if (type1 == TypeLong::ZERO || type2 == TypeLong::ZERO) { // (Add 0 x) == x
      Node* add_result = new (phase->C) AddLNode(arg1, arg2);
      return no_overflow(phase, add_result);
    }
+ template <typename OverflowOp>
+ class MulHelper {
+ public:
+   typedef typename OverflowOp::TypeClass TypeClass;
  
!   if (type2->singleton()) {
      return NULL; // no change - keep constant on the right
!   static bool can_overflow(const Type* type1, const Type* type2) {
+     if (type1 == TypeClass::ZERO || type2 == TypeClass::ZERO) {
+       return false;
+     } else if (type1 == TypeClass::ONE || type2 == TypeClass::ONE) {
+       return false;
      }
  
    if (type1->singleton()) {
      // Make it x + Constant - move constant to the right
      swap_edges(1, 2);
      return this;
+     return true;
    }
+ };
  
!   if (arg2->is_Load()) {
      return NULL; // no change - keep load on the right
-   }
! bool OverflowAddINode::will_overflow(jint v1, jint v2) const {
+   return AddHelper<OverflowAddINode>::will_overflow(v1, v2);
! }
  
!   if (arg1->is_Load()) {
      // Make it x + Load - move load to the right
      swap_edges(1, 2);
      return this;
    }
! bool OverflowSubINode::will_overflow(jint v1, jint v2) const {
+   return SubHelper<OverflowSubINode>::will_overflow(v1, v2);
+ }
  
!   if (arg1->_idx > arg2->_idx) {
      // Sort the edges
      swap_edges(1, 2);
!     return this;
! bool OverflowMulINode::will_overflow(jint v1, jint v2) const {
+     jlong result = (jlong) v1 * (jlong) v2;
+     if ((jint) result == result) {
!       return false;
      }
  
    return NULL;
+     return true;
  }
  
! Node* SubExactINode::Ideal(PhaseGVN* phase, bool can_reshape) {
!   Node* arg1 = in(1);
    Node* arg2 = in(2);
! bool OverflowAddLNode::will_overflow(jlong v1, jlong v2) const {
!   return AddHelper<OverflowAddLNode>::will_overflow(v1, v2);
+ }
  
    const Type* type1 = phase->type(arg1);
!   const Type* type2 = phase->type(arg2);
+ bool OverflowSubLNode::will_overflow(jlong v1, jlong v2) const {
!   return SubHelper<OverflowSubLNode>::will_overflow(v1, v2);
+ }
  
    if (type1 != Type::TOP && type1->singleton() &&
        type2 != Type::TOP && type2->singleton()) {
!     jint val1 = arg1->get_int();
!     jint val2 = arg2->get_int();
      jint result = val1 - val2;
+ bool OverflowMulLNode::will_overflow(jlong val1, jlong val2) const {
+     jlong result = val1 * val2;
!     jlong ax = (val1 < 0 ? -val1 : val1);
!     jlong ay = (val2 < 0 ? -val2 : val2);
  
      // Hacker's Delight 2-12 Overflow iff the arguments have different signs and
      // the sign of the result is different than the sign of arg1
      if (((val1 ^ val2) & (val1 ^ result)) >= 0) {
        Node* con_result = ConINode::make(phase->C, result);
        return no_overflow(phase, con_result);
      }
      return NULL;
+     bool overflow = false;
+     if ((ax | ay) & CONST64(0xFFFFFFFF00000000)) {
+       // potential overflow if any bit in upper 32 bits are set
+       if ((val1 == min_jlong && val2 == -1) || (val2 == min_jlong && val1 == -1)) {
+         // -1 * Long.MIN_VALUE will overflow
+         overflow = true;
+       } else if (val2 != 0 && (result / val2 != val1)) {
+         overflow = true;
        }
  
    if (type1 == TypeInt::ZERO || type2 == TypeInt::ZERO) {
      // Sub with zero is the same as add with zero
      Node* add_result = new (phase->C) AddINode(arg1, arg2);
      return no_overflow(phase, add_result);
      }
  
!   return NULL;
!     return overflow;
  }
  
  Node* SubExactLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
    Node* arg1 = in(1);
    Node* arg2 = in(2);
+ template <typename OverflowOp>
+ struct IdealHelper {
+   typedef typename OverflowOp::TypeClass TypeClass; // TypeInt, TypeLong
+   typedef typename TypeClass::NativeType NativeType;
  
+   static Node* Ideal(const OverflowOp* node, PhaseGVN* phase, bool can_reshape) {
+     Node* arg1 = node->in(1);
+     Node* arg2 = node->in(2);
      const Type* type1 = phase->type(arg1);
      const Type* type2 = phase->type(arg2);
  
      if (type1 != Type::TOP && type1->singleton() &&
          type2 != Type::TOP && type2->singleton()) {
!     jlong val1 = arg1->get_long();
!     jlong val2 = arg2->get_long();
      jlong result = val1 - val2;
  
      // Hacker's Delight 2-12 Overflow iff the arguments have different signs and
      // the sign of the result is different than the sign of arg1
      if (((val1 ^ val2) & (val1 ^ result)) >= 0) {
        Node* con_result = ConLNode::make(phase->C, result);
        return no_overflow(phase, con_result);
!       NativeType val1 = TypeClass::as_self(type1)->get_con();
!       NativeType val2 = TypeClass::as_self(type2)->get_con();
+       if (node->will_overflow(val1, val2) == false) {
+         Node* con_result = ConINode::make(phase->C, 0);
+         return con_result;
        }
        return NULL;
      }
  
    if (type1 == TypeLong::ZERO || type2 == TypeLong::ZERO) {
      // Sub with zero is the same as add with zero
      Node* add_result = new (phase->C) AddLNode(arg1, arg2);
      return no_overflow(phase, add_result);
    }
  
      return NULL;
  }
  
  Node* NegExactINode::Ideal(PhaseGVN* phase, bool can_reshape) {
    Node *arg = in(1);
  
    const Type* type = phase->type(arg);
    if (type != Type::TOP && type->singleton()) {
      jint value = arg->get_int();
      if (value != min_jint) {
        Node* neg_result = ConINode::make(phase->C, -value);
        return no_overflow(phase, neg_result);
    }
    }
    return NULL;
  }
  
! Node* NegExactLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
!   Node *arg = in(1);
!   static const Type* Value(const OverflowOp* node, PhaseTransform* phase) {
!     const Type *t1 = phase->type( node->in(1) );
+     const Type *t2 = phase->type( node->in(2) );
+     if( t1 == Type::TOP ) return Type::TOP;
+     if( t2 == Type::TOP ) return Type::TOP;
  
!   const Type* type = phase->type(arg);
    if (type != Type::TOP && type->singleton()) {
      jlong value = arg->get_long();
      if (value != min_jlong) {
        Node* neg_result = ConLNode::make(phase->C, -value);
        return no_overflow(phase, neg_result);
      }
    }
    return NULL;
  }
!     const TypeClass* i1 = TypeClass::as_self(t1);
+     const TypeClass* i2 = TypeClass::as_self(t2);
  
! Node* MulExactINode::Ideal(PhaseGVN* phase, bool can_reshape) {
    Node* arg1 = in(1);
!   Node* arg2 = in(2);
  
    const Type* type1 = phase->type(arg1);
    const Type* type2 = phase->type(arg2);
  
    if (type1 != Type::TOP && type1->singleton() &&
        type2 != Type::TOP && type2->singleton()) {
      jint val1 = arg1->get_int();
      jint val2 = arg2->get_int();
      jlong result = (jlong) val1 * (jlong) val2;
      if ((jint) result == result) {
        // no overflow
        Node* mul_result = ConINode::make(phase->C, result);
        return no_overflow(phase, mul_result);
      }
!     if (t1->singleton() && t2->singleton()) {
+       if (i1 == NULL || i2 == NULL) {
!         return TypeInt::CC;
        }
  
    if (type1 == TypeInt::ZERO || type2 == TypeInt::ZERO) {
!     return no_overflow(phase, ConINode::make(phase->C, 0));
+       NativeType val1 = i1->get_con();
!       NativeType val2 = i2->get_con();
+       if (node->will_overflow(val1, val2)) {
+         return TypeInt::CC;
        }
  
!   if (type1 == TypeInt::ONE) {
      Node* mul_result = new (phase->C) AddINode(arg2, phase->intcon(0));
!     return no_overflow(phase, mul_result);
+       return TypeInt::ZERO;
!     } else if (i1 != TypeClass::TYPE_DOMAIN && i2 != TypeClass::TYPE_DOMAIN) {
+       if (node->will_overflow(i1->_lo, i2->_lo)) {
!         return TypeInt::CC;
+       } else if (node->will_overflow(i1->_lo, i2->_hi)) {
+         return TypeInt::CC;
+       } else if (node->will_overflow(i1->_hi, i2->_lo)) {
+         return TypeInt::CC;
+       } else if (node->will_overflow(i1->_hi, i2->_hi)) {
+         return TypeInt::CC;
        }
    if (type2 == TypeInt::ONE) {
      Node* mul_result = new (phase->C) AddINode(arg1, phase->intcon(0));
      return no_overflow(phase, mul_result);
+       return TypeInt::ZERO;
      }
  
!   if (type1 == TypeInt::MINUS_1) {
!     return new (phase->C) NegExactINode(NULL, arg2);
!     if (!node->can_overflow(t1, t2)) {
!       return TypeInt::ZERO;
      }
  
    if (type2 == TypeInt::MINUS_1) {
      return new (phase->C) NegExactINode(NULL, arg1);
+     return TypeInt::CC;
    }
+ };
  
    return NULL;
+ Node* OverflowINode::Ideal(PhaseGVN* phase, bool can_reshape) {
+   return IdealHelper<OverflowINode>::Ideal(this, phase, can_reshape);
  }
  
! Node* MulExactLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
!   Node* arg1 = in(1);
    Node* arg2 = in(2);
  
    const Type* type1 = phase->type(arg1);
    const Type* type2 = phase->type(arg2);
  
    if (type1 != Type::TOP && type1->singleton() &&
        type2 != Type::TOP && type2->singleton()) {
      jlong val1 = arg1->get_long();
      jlong val2 = arg2->get_long();
! Node* OverflowLNode::Ideal(PhaseGVN* phase, bool can_reshape) {
!   return IdealHelper<OverflowLNode>::Ideal(this, phase, can_reshape);
+ }
  
      jlong result = val1 * val2;
!     jlong ax = (val1 < 0 ? -val1 : val1);
      jlong ay = (val2 < 0 ? -val2 : val2);
+ const Type* OverflowINode::Value(PhaseTransform* phase) const {
!   return IdealHelper<OverflowINode>::Value(this, phase);
+ }
  
      bool overflow = false;
      if ((ax | ay) & CONST64(0xFFFFFFFF00000000)) {
        // potential overflow if any bit in upper 32 bits are set
        if ((val1 == min_jlong && val2 == -1) || (val2 == min_jlong && val1 == -1)) {
          // -1 * Long.MIN_VALUE will overflow
          overflow = true;
        } else if (val2 != 0 && (result / val2 != val1)) {
          overflow = true;
        }
      }
+ const Type* OverflowLNode::Value(PhaseTransform* phase) const {
+   return IdealHelper<OverflowLNode>::Value(this, phase);
+ }
  
!     if (!overflow) {
!       Node* mul_result = ConLNode::make(phase->C, result);
        return no_overflow(phase, mul_result);
      }
    }
! bool OverflowAddINode::can_overflow(const Type* t1, const Type* t2) const {
!   return AddHelper<OverflowAddINode>::can_overflow(t1, t2);
+ }
  
!   if (type1 == TypeLong::ZERO || type2 == TypeLong::ZERO) {
      return no_overflow(phase, ConLNode::make(phase->C, 0));
! bool OverflowSubINode::can_overflow(const Type* t1, const Type* t2) const {
+   if (in(1) == in(2)) {
+     return false;
    }
+   return SubHelper<OverflowSubINode>::can_overflow(t1, t2);
+ }
  
!   if (type1 == TypeLong::ONE) {
!     Node* mul_result = new (phase->C) AddLNode(arg2, phase->longcon(0));
      return no_overflow(phase, mul_result);
    }
    if (type2 == TypeLong::ONE) {
      Node* mul_result = new (phase->C) AddLNode(arg1, phase->longcon(0));
      return no_overflow(phase, mul_result);
    }
! bool OverflowMulINode::can_overflow(const Type* t1, const Type* t2) const {
!   return MulHelper<OverflowMulINode>::can_overflow(t1, t2);
+ }
  
!   if (type1 == TypeLong::MINUS_1) {
!     return new (phase->C) NegExactLNode(NULL, arg2);
-   }
! bool OverflowAddLNode::can_overflow(const Type* t1, const Type* t2) const {
!   return AddHelper<OverflowAddLNode>::can_overflow(t1, t2);
! }
  
!   if (type2 == TypeLong::MINUS_1) {
      return new (phase->C) NegExactLNode(NULL, arg1);
! bool OverflowSubLNode::can_overflow(const Type* t1, const Type* t2) const {
+   if (in(1) == in(2)) {
+     return false;
    }
+   return SubHelper<OverflowSubLNode>::can_overflow(t1, t2);
+ }
  
    return NULL;
+ bool OverflowMulLNode::can_overflow(const Type* t1, const Type* t2) const {
+   return MulHelper<OverflowMulLNode>::can_overflow(t1, t2);
  }
  
+ const Type* OverflowNode::sub(const Type* t1, const Type* t2) const {
+   fatal(err_msg_res("sub() should not be called for '%s'", NodeClassNames[this->Opcode()]));
+   return TypeInt::CC;
+ }