src/hotspot/share/opto/compile.cpp

rev 53149 : [mq]: flatten-alias-types.patch

*** 1468,1482 ****
          ptr = TypePtr::BotPTR;
        } else if( offset == oopDesc::mark_offset_in_bytes() ) {
          tj = TypeInstPtr::MARK;
          ta = TypeAryPtr::RANGE; // generic ignored junk
          ptr = TypePtr::BotPTR;
! #if INCLUDE_SHENANDOAHGC
!       } else if (offset == BrooksPointer::byte_offset() && UseShenandoahGC) {
!         // Need to distinguish brooks ptr as is.
!         tj = ta = TypeAryPtr::make(ptr,ta->ary(),ta->klass(),false,offset);
! #endif
        } else {                  // Random constant offset into array body
          offset = Type::OffsetBot;   // Flatten constant access into array body
          tj = ta = TypeAryPtr::make(ptr,ta->ary(),ta->klass(),false,offset);
        }
      }
--- 1468,1479 ----
          ptr = TypePtr::BotPTR;
        } else if( offset == oopDesc::mark_offset_in_bytes() ) {
          tj = TypeInstPtr::MARK;
          ta = TypeAryPtr::RANGE; // generic ignored junk
          ptr = TypePtr::BotPTR;
!       } else if (BarrierSet::barrier_set()->barrier_set_c2()->flatten_gc_alias_type(tj)) {
!         ta = tj->isa_aryptr();
        } else {                  // Random constant offset into array body
          offset = Type::OffsetBot;   // Flatten constant access into array body
          tj = ta = TypeAryPtr::make(ptr,ta->ary(),ta->klass(),false,offset);
        }
      }
*** 1537,1554 ****
        // First handle header references such as a LoadKlassNode, even if the
        // object's klass is unloaded at compile time (4965979).
        if (!is_known_inst) { // Do it only for non-instance types
          tj = to = TypeInstPtr::make(TypePtr::BotPTR, env()->Object_klass(), false, NULL, offset);
        }
!     } else if (SHENANDOAHGC_ONLY((offset != BrooksPointer::byte_offset() || !UseShenandoahGC) &&) (offset < 0 || offset >= k->size_helper() * wordSize)) {
        // Static fields are in the space above the normal instance
        // fields in the java.lang.Class instance.
        if (to->klass() != ciEnv::current()->Class_klass()) {
          to = NULL;
          tj = TypeOopPtr::BOTTOM;
          offset = tj->offset();
        }
      } else {
        ciInstanceKlass *canonical_holder = k->get_canonical_holder(offset);
        if (!k->equals(canonical_holder) || tj->offset() != offset) {
          if( is_known_inst ) {
            tj = to = TypeInstPtr::make(to->ptr(), canonical_holder, true, NULL, offset, to->instance_id());
--- 1534,1553 ----
        // First handle header references such as a LoadKlassNode, even if the
        // object's klass is unloaded at compile time (4965979).
        if (!is_known_inst) { // Do it only for non-instance types
          tj = to = TypeInstPtr::make(TypePtr::BotPTR, env()->Object_klass(), false, NULL, offset);
        }
!     } else if (offset >= k->size_helper() * wordSize) {
        // Static fields are in the space above the normal instance
        // fields in the java.lang.Class instance.
        if (to->klass() != ciEnv::current()->Class_klass()) {
          to = NULL;
          tj = TypeOopPtr::BOTTOM;
          offset = tj->offset();
        }
+     } else if (BarrierSet::barrier_set()->barrier_set_c2()->flatten_gc_alias_type(tj)) {
+       to = tj->is_instptr();
      } else {
        ciInstanceKlass *canonical_holder = k->get_canonical_holder(offset);
        if (!k->equals(canonical_holder) || tj->offset() != offset) {
          if( is_known_inst ) {
            tj = to = TypeInstPtr::make(to->ptr(), canonical_holder, true, NULL, offset, to->instance_id());