src/share/vm/opto/graphKit.cpp

*** 3231,3253 ****
    Node* buffer_adr  = __ AddP(no_base, thread, __ ConX(buffer_offset));
    Node* index_adr   = __ AddP(no_base, thread, __ ConX(index_offset));
  
    // Now some of the values
  
!   Node* marking = __ load(no_ctrl, marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw);
!   Node* index   = __ load(no_ctrl, index_adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw);
!   Node* buffer  = __ load(no_ctrl, buffer_adr, TypeRawPtr::NOTNULL, T_ADDRESS, Compile::AliasIdxRaw);
  
    // if (!marking)
    __ if_then(marking, BoolTest::ne, zero); {
  
      const Type* t1 = adr->bottom_type();
      const Type* t2 = val->bottom_type();
  
      Node* orig = __ load(no_ctrl, adr, val_type, bt, alias_idx);
      // if (orig != NULL)
      __ if_then(orig, BoolTest::ne, null()); {
  
        // load original value
        // alias_idx correct??
  
        // is the queue for this thread full?
--- 3231,3253 ----
    Node* buffer_adr  = __ AddP(no_base, thread, __ ConX(buffer_offset));
    Node* index_adr   = __ AddP(no_base, thread, __ ConX(index_offset));
  
    // Now some of the values
  
!   Node* marking = __ load(__ ctrl(), marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw);
  
    // if (!marking)
    __ if_then(marking, BoolTest::ne, zero); {
+     Node* index   = __ load(__ ctrl(), index_adr, TypeInt::INT, T_INT, Compile::AliasIdxRaw);
  
      const Type* t1 = adr->bottom_type();
      const Type* t2 = val->bottom_type();
  
      Node* orig = __ load(no_ctrl, adr, val_type, bt, alias_idx);
      // if (orig != NULL)
      __ if_then(orig, BoolTest::ne, null()); {
+       Node* buffer  = __ load(__ ctrl(), buffer_adr, TypeRawPtr::NOTNULL, T_ADDRESS, Compile::AliasIdxRaw);
  
        // load original value
        // alias_idx correct??
  
        // is the queue for this thread full?