src/share/vm/ci/ciInstanceKlass.cpp

rev 8961 : [mq]: diff-shenandoah.patch

*** 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();
--- 177,192 ----
  // ------------------------------------------------------------------
  // ciInstanceKlass::get_canonical_holder
  //
  ciInstanceKlass* ciInstanceKlass::get_canonical_holder(int offset) {
    #ifdef ASSERT
!   if (!(offset >= 0 && offset < layout_helper() || (offset == -8 && 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();