src/share/vm/opto/memnode.cpp

rev 8049 : castpp gcm
rev 9347 : 8140309: [REDO] failed: no mismatched stores, except on raw memory: StoreB StoreI
Summary: Mismatched stores on same slice possible with Unsafe.Put*Unaligned methods
Reviewed-by:

*** 70,81 ****
      _adr_type = in(Address)->bottom_type()->isa_ptr();
  #endif
    dump_adr_type(this, _adr_type, st);
  
    Compile* C = Compile::current();
!   if( C->alias_type(_adr_type)->is_volatile() )
      st->print(" Volatile!");
  }
  
  void MemNode::dump_adr_type(const Node* mem, const TypePtr* adr_type, outputStream *st) {
    st->print(" @");
    if (adr_type == NULL) {
--- 70,88 ----
      _adr_type = in(Address)->bottom_type()->isa_ptr();
  #endif
    dump_adr_type(this, _adr_type, st);
  
    Compile* C = Compile::current();
!   if (C->alias_type(_adr_type)->is_volatile()) {
      st->print(" Volatile!");
+   }
+   if (_unaligned_access) {
+     st->print(" unaligned");
+   }
+   if (_mismatched_access) {
+     st->print(" mismatched");
+   }
  }
  
  void MemNode::dump_adr_type(const Node* mem, const TypePtr* adr_type, outputStream *st) {
    st->print(" @");
    if (adr_type == NULL) {
*** 2391,2401 ****
        assert(st != st->in(MemNode::Memory), "dead loop in StoreNode::Ideal");
        assert(Opcode() == st->Opcode() ||
               st->Opcode() == Op_StoreVector ||
               Opcode() == Op_StoreVector ||
               phase->C->get_alias_index(adr_type()) == Compile::AliasIdxRaw ||
!              (Opcode() == Op_StoreL && st->Opcode() == Op_StoreI), // expanded ClearArrayNode
               "no mismatched stores, except on raw memory: %s %s", NodeClassNames[Opcode()], NodeClassNames[st->Opcode()]);
  
        if (st->in(MemNode::Address)->eqv_uncast(address) &&
            st->as_Store()->memory_size() <= this->memory_size()) {
          Node* use = st->raw_out(0);
--- 2398,2409 ----
        assert(st != st->in(MemNode::Memory), "dead loop in StoreNode::Ideal");
        assert(Opcode() == st->Opcode() ||
               st->Opcode() == Op_StoreVector ||
               Opcode() == Op_StoreVector ||
               phase->C->get_alias_index(adr_type()) == Compile::AliasIdxRaw ||
!              (Opcode() == Op_StoreL && st->Opcode() == Op_StoreI) || // expanded ClearArrayNode
!              (is_mismatched_access() || st->as_Store()->is_mismatched_access()),
               "no mismatched stores, except on raw memory: %s %s", NodeClassNames[Opcode()], NodeClassNames[st->Opcode()]);
  
        if (st->in(MemNode::Address)->eqv_uncast(address) &&
            st->as_Store()->memory_size() <= this->memory_size()) {
          Node* use = st->raw_out(0);
*** 3211,3220 ****
--- 3219,3231 ----
  // an initialization.  Returns zero if a check fails.
  // On success, returns the (constant) offset to which the store applies,
  // within the initialized memory.
  intptr_t InitializeNode::can_capture_store(StoreNode* st, PhaseTransform* phase, bool can_reshape) {
    const int FAIL = 0;
+   if (st->is_unaligned_access()) {
+     return FAIL;
+   }
    if (st->req() != MemNode::ValueIn + 1)
      return FAIL;                // an inscrutable StoreNode (card mark?)
    Node* ctl = st->in(MemNode::Control);
    if (!(ctl != NULL && ctl->is_Proj() && ctl->in(0) == this))
      return FAIL;                // must be unconditional after the initialization