src/hotspot/share/gc/g1/c2/g1BarrierSetC2.cpp

*** 592,629 ****
  
  #undef __
  
  Node* G1BarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) const {
    DecoratorSet decorators = access.decorators();
-   GraphKit* kit = access.kit();
- 
    Node* adr = access.addr().node();
    Node* obj = access.base();
  
    bool mismatched = (decorators & C2_MISMATCHED) != 0;
    bool unknown = (decorators & ON_UNKNOWN_OOP_REF) != 0;
    bool in_heap = (decorators & IN_HEAP) != 0;
    bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0;
    bool is_unordered = (decorators & MO_UNORDERED) != 0;
    bool need_cpu_mem_bar = !is_unordered || mismatched || !in_heap;
  
!   Node* offset = adr->is_AddP() ? adr->in(AddPNode::Offset) : kit->top();
    Node* load = CardTableBarrierSetC2::load_at_resolved(access, val_type);
  
    // If we are reading the value of the referent field of a Reference
    // object (either by using Unsafe directly or through reflection)
    // then, if G1 is enabled, we need to record the referent in an
    // SATB log buffer using the pre-barrier mechanism.
    // Also we need to add memory barrier to prevent commoning reads
    // from this field across safepoint since GC can change its value.
    bool need_read_barrier = in_heap && (on_weak ||
!                                        (unknown && offset != kit->top() && obj != kit->top()));
  
    if (!access.is_oop() || !need_read_barrier) {
      return load;
    }
  
    if (on_weak) {
      // Use the pre-barrier to record the value in the referent field
      pre_barrier(kit, false /* do_load */,
                  kit->control(),
                  NULL /* obj */, NULL /* adr */, max_juint /* alias_idx */, NULL /* val */, NULL /* val_type */,
--- 592,632 ----
  
  #undef __
  
  Node* G1BarrierSetC2::load_at_resolved(C2Access& access, const Type* val_type) const {
    DecoratorSet decorators = access.decorators();
    Node* adr = access.addr().node();
    Node* obj = access.base();
  
    bool mismatched = (decorators & C2_MISMATCHED) != 0;
    bool unknown = (decorators & ON_UNKNOWN_OOP_REF) != 0;
    bool in_heap = (decorators & IN_HEAP) != 0;
    bool on_weak = (decorators & ON_WEAK_OOP_REF) != 0;
    bool is_unordered = (decorators & MO_UNORDERED) != 0;
    bool need_cpu_mem_bar = !is_unordered || mismatched || !in_heap;
  
!   Node* top = Compile::current()->top();
!   Node* offset = adr->is_AddP() ? adr->in(AddPNode::Offset) : top;
    Node* load = CardTableBarrierSetC2::load_at_resolved(access, val_type);
  
    // If we are reading the value of the referent field of a Reference
    // object (either by using Unsafe directly or through reflection)
    // then, if G1 is enabled, we need to record the referent in an
    // SATB log buffer using the pre-barrier mechanism.
    // Also we need to add memory barrier to prevent commoning reads
    // from this field across safepoint since GC can change its value.
    bool need_read_barrier = in_heap && (on_weak ||
!                                        (unknown && offset != top && obj != top));
  
    if (!access.is_oop() || !need_read_barrier) {
      return load;
    }
  
+   assert(access.is_parse_access(), "entry not supported at optimization time");
+   C2ParseAccess& parse_access = static_cast<C2ParseAccess&>(access);
+   GraphKit* kit = parse_access.kit();
+ 
    if (on_weak) {
      // Use the pre-barrier to record the value in the referent field
      pre_barrier(kit, false /* do_load */,
                  kit->control(),
                  NULL /* obj */, NULL /* adr */, max_juint /* alias_idx */, NULL /* val */, NULL /* val_type */,