src/share/vm/opto/graphKit.cpp

rev 9085 : review

*** 1455,1465 ****
  //
  
  // factory methods in "int adr_idx"
  Node* GraphKit::make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
                            int adr_idx,
!                           MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency, bool require_atomic_access) {
    assert(adr_idx != Compile::AliasIdxTop, "use other make_load factory" );
    const TypePtr* adr_type = NULL; // debug-mode-only argument
    debug_only(adr_type = C->get_adr_type(adr_idx));
    Node* mem = memory(adr_idx);
    Node* ld;
--- 1455,1466 ----
  //
  
  // factory methods in "int adr_idx"
  Node* GraphKit::make_load(Node* ctl, Node* adr, const Type* t, BasicType bt,
                            int adr_idx,
!                           MemNode::MemOrd mo, LoadNode::ControlDependency control_dependency,
!                           bool require_atomic_access, bool unaligned) {
    assert(adr_idx != Compile::AliasIdxTop, "use other make_load factory" );
    const TypePtr* adr_type = NULL; // debug-mode-only argument
    debug_only(adr_type = C->get_adr_type(adr_idx));
    Node* mem = memory(adr_idx);
    Node* ld;
*** 1468,1477 ****
--- 1469,1481 ----
    } else if (require_atomic_access && bt == T_DOUBLE) {
      ld = LoadDNode::make_atomic(ctl, mem, adr, adr_type, t, mo, control_dependency);
    } else {
      ld = LoadNode::make(_gvn, ctl, mem, adr, adr_type, t, bt, mo, control_dependency);
    }
+   if (unaligned) {
+     ld->as_Load()->set_unaligned();
+   }
    ld = _gvn.transform(ld);
    if ((bt == T_OBJECT) && C->do_escape_analysis() || C->eliminate_boxing()) {
      // Improve graph before escape analysis and boxing elimination.
      record_for_igvn(ld);
    }
*** 1479,1489 ****
  }
  
  Node* GraphKit::store_to_memory(Node* ctl, Node* adr, Node *val, BasicType bt,
                                  int adr_idx,
                                  MemNode::MemOrd mo,
!                                 bool require_atomic_access) {
    assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
    const TypePtr* adr_type = NULL;
    debug_only(adr_type = C->get_adr_type(adr_idx));
    Node *mem = memory(adr_idx);
    Node* st;
--- 1483,1494 ----
  }
  
  Node* GraphKit::store_to_memory(Node* ctl, Node* adr, Node *val, BasicType bt,
                                  int adr_idx,
                                  MemNode::MemOrd mo,
!                                 bool require_atomic_access,
!                                 bool unaligned) {
    assert(adr_idx != Compile::AliasIdxTop, "use other store_to_memory factory" );
    const TypePtr* adr_type = NULL;
    debug_only(adr_type = C->get_adr_type(adr_idx));
    Node *mem = memory(adr_idx);
    Node* st;
*** 1492,1501 ****
--- 1497,1509 ----
    } else if (require_atomic_access && bt == T_DOUBLE) {
      st = StoreDNode::make_atomic(ctl, mem, adr, adr_type, val, mo);
    } else {
      st = StoreNode::make(_gvn, ctl, mem, adr, adr_type, val, bt, mo);
    }
+   if (unaligned) {
+     st->as_Store()->set_unaligned();
+   }
    st = _gvn.transform(st);
    set_memory(st, adr_idx);
    // Back-to-back stores can only remove intermediate store with DU info
    // so push on worklist for optimizer.
    if (mem->req() > MemNode::Address && adr == mem->in(MemNode::Address))