hotspot/src/share/vm/opto/graphKit.cpp

rev 6883 : 8057622: java/util/stream/test/org/openjdk/tests/java/util/stream/InfiniteStreamWithLimitOpTest: SEGV inside compiled code (sparc)
Summary: In Parse::array_store_check(), add control edge FROM IfTrue branch of runtime type check of the destination array TO loading _element_klass from destination array.
Reviewed-by: kvn, roland, anoll
Contributed-by: Zoltan Majo <zoltan.majo@oracle.com>

*** 1148,1158 ****
  Node* GraphKit::load_object_klass(Node* obj) {
    // Special-case a fresh allocation to avoid building nodes:
    Node* akls = AllocateNode::Ideal_klass(obj, &_gvn);
    if (akls != NULL)  return akls;
    Node* k_adr = basic_plus_adr(obj, oopDesc::klass_offset_in_bytes());
!   return _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), k_adr, TypeInstPtr::KLASS) );
  }
  
  //-------------------------load_array_length-----------------------------------
  Node* GraphKit::load_array_length(Node* array) {
    // Special-case a fresh allocation to avoid building nodes:
--- 1148,1158 ----
  Node* GraphKit::load_object_klass(Node* obj) {
    // Special-case a fresh allocation to avoid building nodes:
    Node* akls = AllocateNode::Ideal_klass(obj, &_gvn);
    if (akls != NULL)  return akls;
    Node* k_adr = basic_plus_adr(obj, oopDesc::klass_offset_in_bytes());
!   return _gvn.transform(LoadKlassNode::make(_gvn, NULL, immutable_memory(), k_adr, TypeInstPtr::KLASS));
  }
  
  //-------------------------load_array_length-----------------------------------
  Node* GraphKit::load_array_length(Node* array) {
    // Special-case a fresh allocation to avoid building nodes:
*** 2540,2550 ****
    Node *p2 = _gvn.transform( new (C) AddPNode(subklass,subklass,chk_off_X) );
    // For some types like interfaces the following loadKlass is from a 1-word
    // cache which is mutable so can't use immutable memory.  Other
    // types load from the super-class display table which is immutable.
    Node *kmem = might_be_cache ? memory(p2) : immutable_memory();
!   Node *nkls = _gvn.transform( LoadKlassNode::make( _gvn, kmem, p2, _gvn.type(p2)->is_ptr(), TypeKlassPtr::OBJECT_OR_NULL ) );
  
    // Compile speed common case: ARE a subtype and we canNOT fail
    if( superklass == nkls )
      return top();             // false path is dead; no test needed.
  
--- 2540,2550 ----
    Node *p2 = _gvn.transform( new (C) AddPNode(subklass,subklass,chk_off_X) );
    // For some types like interfaces the following loadKlass is from a 1-word
    // cache which is mutable so can't use immutable memory.  Other
    // types load from the super-class display table which is immutable.
    Node *kmem = might_be_cache ? memory(p2) : immutable_memory();
!   Node* nkls = _gvn.transform(LoadKlassNode::make(_gvn, NULL, kmem, p2, _gvn.type(p2)->is_ptr(), TypeKlassPtr::OBJECT_OR_NULL));
  
    // Compile speed common case: ARE a subtype and we canNOT fail
    if( superklass == nkls )
      return top();             // false path is dead; no test needed.