*** old/src/share/vm/opto/graphKit.cpp	Mon Jan 19 10:37:00 2015
--- new/src/share/vm/opto/graphKit.cpp	Mon Jan 19 10:36:59 2015

*** 1661,1686 ****
--- 1661,1671 ----
      return basic_plus_adr(ary, offset);
    }
  
    // must be correct type for alignment purposes
    Node* base  = basic_plus_adr(ary, header);
  #ifdef _LP64
    // The scaled index operand to AddP must be a clean 64-bit value.
    // Java allows a 32-bit int to be incremented to a negative
    // value, which appears in a 64-bit register as a large
    // positive number.  Using that large positive number as an
    // operand in pointer arithmetic has bad consequences.
    // On the other hand, 32-bit overflow is rare, and the possibility
    // can often be excluded, if we annotate the ConvI2L node with
    // a type assertion that its value is known to be a small positive
    // number.  (The prior range check has ensured this.)
    // This assertion is used by ConvI2LNode::Ideal.
    int index_max = max_jint - 1;  // array size is max_jint, index is one less
    if (sizetype != NULL)  index_max = sizetype->_hi - 1;
    const TypeLong* lidxtype = TypeLong::make(CONST64(0), index_max, Type::WidenMax);
    idx = _gvn.transform( new ConvI2LNode(idx, lidxtype) );
  #endif
+   idx = Compile::conv_I2X_index(&_gvn, idx, sizetype);
    Node* scale = _gvn.transform( new LShiftXNode(idx, intcon(shift)) );
    return basic_plus_adr(ary, base, scale);
  }
  
  //-------------------------load_array_element-------------------------