src/share/vm/classfile/javaClasses.cpp

rev 2694 : imported patch headers_only
rev 2695 : shared changes

*** 56,65 ****
--- 56,68 ----
  # include "thread_solaris.inline.hpp"
  #endif
  #ifdef TARGET_OS_FAMILY_windows
  # include "thread_windows.inline.hpp"
  #endif
+ #ifdef TARGET_OS_FAMILY_bsd
+ # include "thread_bsd.inline.hpp"
+ #endif
  
  #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java)    \
    klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum);
  
  #define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java)           \
*** 1143,1153 ****
        // Neither soucename and linenumber
        sprintf(buf + (int)strlen(buf), "(Unknown Source)");
      }
      nmethod* nm = method->code();
      if (WizardMode && nm != NULL) {
!       sprintf(buf + (int)strlen(buf), "(nmethod " PTR_FORMAT ")", (intptr_t)nm);
      }
    }
  
    return buf;
  }
--- 1146,1156 ----
        // Neither soucename and linenumber
        sprintf(buf + (int)strlen(buf), "(Unknown Source)");
      }
      nmethod* nm = method->code();
      if (WizardMode && nm != NULL) {
!       sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm);
      }
    }
  
    return buf;
  }
*** 2692,2702 ****
    // (For C2:  keep this until we have throttling logic for uncommon traps.)
    if (k != NULL) {
      instanceKlass* ik = instanceKlass::cast(k);
      methodOop m_normal   = ik->lookup_method(vmSymbols::setTargetNormal_name(),   vmSymbols::setTarget_signature());
      methodOop m_volatile = ik->lookup_method(vmSymbols::setTargetVolatile_name(), vmSymbols::setTarget_signature());
!     guarantee(m_normal && m_volatile, "must exist");
      m_normal->set_not_compilable_quietly();
      m_volatile->set_not_compilable_quietly();
    }
  }
  
--- 2695,2705 ----
    // (For C2:  keep this until we have throttling logic for uncommon traps.)
    if (k != NULL) {
      instanceKlass* ik = instanceKlass::cast(k);
      methodOop m_normal   = ik->lookup_method(vmSymbols::setTargetNormal_name(),   vmSymbols::setTarget_signature());
      methodOop m_volatile = ik->lookup_method(vmSymbols::setTargetVolatile_name(), vmSymbols::setTarget_signature());
!     guarantee(m_normal != NULL && m_volatile != NULL, "must exist");
      m_normal->set_not_compilable_quietly();
      m_volatile->set_not_compilable_quietly();
    }
  }