src/share/vm/shark/sharkRuntime.cpp

rev 7614 : [mq]: shark-build-hotspot.patch

*** 38,48 ****
  
  JRT_ENTRY(int, SharkRuntime::find_exception_handler(JavaThread* thread,
                                                      int*        indexes,
                                                      int         num_indexes))
    constantPoolHandle pool(thread, method(thread)->constants());
!   KlassHandle exc_klass(thread, ((oop) tos_at(thread, 0))->klass());
  
    for (int i = 0; i < num_indexes; i++) {
      Klass* tmp = pool->klass_at(indexes[i], CHECK_0);
      KlassHandle chk_klass(thread, tmp);
  
--- 38,48 ----
  
  JRT_ENTRY(int, SharkRuntime::find_exception_handler(JavaThread* thread,
                                                      int*        indexes,
                                                      int         num_indexes))
    constantPoolHandle pool(thread, method(thread)->constants());
!   KlassHandle exc_klass(thread, (oop((void*) tos_at(thread, 0)))->klass());
  
    for (int i = 0; i < num_indexes; i++) {
      Klass* tmp = pool->klass_at(indexes[i], CHECK_0);
      KlassHandle chk_klass(thread, tmp);
  
*** 183,193 ****
  
  // Non-VM calls
  // Nothing in these must ever GC!
  
  void SharkRuntime::dump(const char *name, intptr_t value) {
!   oop valueOop = (oop) value;
    tty->print("%s = ", name);
    if (valueOop->is_oop(true))
      valueOop->print_on(tty);
    else if (value >= ' ' && value <= '~')
      tty->print("'%c' (%d)", value, value);
--- 183,193 ----
  
  // Non-VM calls
  // Nothing in these must ever GC!
  
  void SharkRuntime::dump(const char *name, intptr_t value) {
!   oop valueOop = oop((void*) value);
    tty->print("%s = ", name);
    if (valueOop->is_oop(true))
      valueOop->print_on(tty);
    else if (value >= ' ' && value <= '~')
      tty->print("'%c' (%d)", value, value);