src/share/vm/opto/macro.cpp

*** 1468,1478 ****
    InitializeNode* init = alloc->initialization();
    // Store the klass & mark bits
    Node* mark_node = NULL;
    // For now only enable fast locking for non-array types
    if (UseBiasedLocking && (length == NULL)) {
!     mark_node = make_load(control, rawmem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeRawPtr::BOTTOM, T_ADDRESS);
    } else {
      mark_node = makecon(TypeRawPtr::make((address)markOopDesc::prototype()));
    }
    rawmem = make_store(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, T_ADDRESS);
  
--- 1468,1478 ----
    InitializeNode* init = alloc->initialization();
    // Store the klass & mark bits
    Node* mark_node = NULL;
    // For now only enable fast locking for non-array types
    if (UseBiasedLocking && (length == NULL)) {
!     mark_node = make_load(control, rawmem, klass_node, Klass::prototype_header_offset_in_bytes(), TypeRawPtr::BOTTOM, T_ADDRESS);
    } else {
      mark_node = makecon(TypeRawPtr::make((address)markOopDesc::prototype()));
    }
    rawmem = make_store(control, rawmem, object, oopDesc::mark_offset_in_bytes(), mark_node, T_ADDRESS);
  
*** 1956,1966 ****
          klass_node->in(1)->init_req(0, ctrl);
        } else
  #endif
        klass_node->init_req(0, ctrl);
      }
!     Node *proto_node = make_load(ctrl, mem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeX_X, TypeX_X->basic_type());
  
      Node* thread = transform_later(new (C, 1) ThreadLocalNode());
      Node* cast_thread = transform_later(new (C, 2) CastP2XNode(ctrl, thread));
      Node* o_node = transform_later(new (C, 3) OrXNode(cast_thread, proto_node));
      Node* x_node = transform_later(new (C, 3) XorXNode(o_node, mark_node));
--- 1956,1966 ----
          klass_node->in(1)->init_req(0, ctrl);
        } else
  #endif
        klass_node->init_req(0, ctrl);
      }
!     Node *proto_node = make_load(ctrl, mem, klass_node, Klass::prototype_header_offset_in_bytes(), TypeX_X, TypeX_X->basic_type());
  
      Node* thread = transform_later(new (C, 1) ThreadLocalNode());
      Node* cast_thread = transform_later(new (C, 2) CastP2XNode(ctrl, thread));
      Node* o_node = transform_later(new (C, 3) OrXNode(cast_thread, proto_node));
      Node* x_node = transform_later(new (C, 3) XorXNode(o_node, mark_node));