src/share/vm/ci/ciInstanceKlass.cpp

*** 26,35 ****
--- 26,36 ----
  #include "ci/ciField.hpp"
  #include "ci/ciInstance.hpp"
  #include "ci/ciInstanceKlass.hpp"
  #include "ci/ciUtilities.hpp"
  #include "classfile/systemDictionary.hpp"
+ #include "gc/shenandoah/brooksPointer.hpp"
  #include "memory/allocation.hpp"
  #include "memory/allocation.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/fieldStreams.hpp"
  #include "runtime/fieldDescriptor.hpp"
*** 177,192 ****
  // ------------------------------------------------------------------
  // ciInstanceKlass::get_canonical_holder
  //
  ciInstanceKlass* ciInstanceKlass::get_canonical_holder(int offset) {
    #ifdef ASSERT
!   if (!(offset >= 0 && offset < layout_helper())) {
      tty->print("*** get_canonical_holder(%d) on ", offset);
      this->print();
      tty->print_cr(" ***");
    };
!   assert(offset >= 0 && offset < layout_helper(), "offset must be tame");
    #endif
  
    if (offset < instanceOopDesc::base_offset_in_bytes()) {
      // All header offsets belong properly to java/lang/Object.
      return CURRENT_ENV->Object_klass();
--- 178,193 ----
  // ------------------------------------------------------------------
  // ciInstanceKlass::get_canonical_holder
  //
  ciInstanceKlass* ciInstanceKlass::get_canonical_holder(int offset) {
    #ifdef ASSERT
!   if (!(offset >= 0 && offset < layout_helper() || (offset == BrooksPointer::BYTE_OFFSET && UseShenandoahGC))) {
      tty->print("*** get_canonical_holder(%d) on ", offset);
      this->print();
      tty->print_cr(" ***");
    };
!   assert(offset >= 0 && offset < layout_helper() || (offset == -8 && UseShenandoahGC), "offset must be tame");
    #endif
  
    if (offset < instanceOopDesc::base_offset_in_bytes()) {
      // All header offsets belong properly to java/lang/Object.
      return CURRENT_ENV->Object_klass();