src/hotspot/share/runtime/deoptimization.cpp

rev 47445 : 8171853: Remove Shark compiler

*** 337,347 ****
        delete list;
      }
  
    }
  
- #ifndef SHARK
    // Compute the caller frame based on the sender sp of stub_frame and stored frame sizes info.
    CodeBlob* cb = stub_frame.cb();
    // Verify we have the right vframeArray
    assert(cb->frame_size() >= 0, "Unexpected frame size");
    intptr_t* unpack_sp = stub_frame.sp() + cb->frame_size();
--- 337,346 ----
*** 357,369 ****
           cb->is_uncommon_trap_stub() ||
           strcmp("Stub<DeoptimizationStub.deoptimizationHandler>", cb->name()) == 0 ||
           strcmp("Stub<UncommonTrapStub.uncommonTrapHandler>", cb->name()) == 0,
           "unexpected code blob: %s", cb->name());
  #endif
- #else
-   intptr_t* unpack_sp = stub_frame.sender(&dummy_map).unextended_sp();
- #endif // !SHARK
  
    // This is a guarantee instead of an assert because if vframe doesn't match
    // we will unpack the wrong deoptimized frame and wind up in strange places
    // where it will be very difficult to figure out what went wrong. Better
    // to die an early death here than some very obscure death later when the
--- 356,365 ----
*** 486,498 ****
    // since the frame will "magically" show the original pc before the deopt
    // and we'd undo the deopt.
  
    frame_pcs[0] = deopt_sender.raw_pc();
  
- #ifndef SHARK
    assert(CodeCache::find_blob_unsafe(frame_pcs[0]) != NULL, "bad pc");
- #endif // SHARK
  
  #ifdef INCLUDE_JVMCI
    if (exceptionObject() != NULL) {
      thread->set_exception_oop(exceptionObject());
      exec_mode = Unpack_exception;
--- 482,492 ----
*** 1447,1457 ****
      mdo = m()->method_data();
    }
    return mdo;
  }
  
! #if defined(COMPILER2) || defined(SHARK) || INCLUDE_JVMCI
  void Deoptimization::load_class_by_index(const constantPoolHandle& constant_pool, int index, TRAPS) {
    // in case of an unresolved klass entry, load the class.
    if (constant_pool->tag_at(index).is_unresolved_klass()) {
      Klass* tk = constant_pool->klass_at_ignore_error(index, CHECK);
      return;
--- 1441,1451 ----
      mdo = m()->method_data();
    }
    return mdo;
  }
  
! #if defined(COMPILER2) || INCLUDE_JVMCI
  void Deoptimization::load_class_by_index(const constantPoolHandle& constant_pool, int index, TRAPS) {
    // in case of an unresolved klass entry, load the class.
    if (constant_pool->tag_at(index).is_unresolved_klass()) {
      Klass* tk = constant_pool->klass_at_ignore_error(index, CHECK);
      return;
*** 2364,2374 ****
      }
      #undef PRINT_STAT_LINE
      if (xtty != NULL)  xtty->tail("statistics");
    }
  }
! #else // COMPILER2 || SHARK || INCLUDE_JVMCI
  
  
  // Stubs for C1 only system.
  bool Deoptimization::trap_state_is_recompiled(int trap_state) {
    return false;
--- 2358,2368 ----
      }
      #undef PRINT_STAT_LINE
      if (xtty != NULL)  xtty->tail("statistics");
    }
  }
! #else // COMPILER2 || INCLUDE_JVMCI
  
  
  // Stubs for C1 only system.
  bool Deoptimization::trap_state_is_recompiled(int trap_state) {
    return false;
*** 2400,2405 ****
                                                int trap_state) {
    jio_snprintf(buf, buflen, "#%d", trap_state);
    return buf;
  }
  
! #endif // COMPILER2 || SHARK || INCLUDE_JVMCI
--- 2394,2399 ----
                                                int trap_state) {
    jio_snprintf(buf, buflen, "#%d", trap_state);
    return buf;
  }
  
! #endif // COMPILER2 || INCLUDE_JVMCI