*** old/src/share/vm/prims/jni.cpp	Mon Nov 12 10:52:09 2012
--- new/src/share/vm/prims/jni.cpp	Mon Nov 12 10:52:09 2012

*** 1288,1323 ****
--- 1288,1297 ----
    JNI_STATIC,
    JNI_VIRTUAL,
    JNI_NONVIRTUAL
  };
  
  static methodHandle jni_resolve_interface_call(Handle recv, methodHandle method, TRAPS) {
    assert(!method.is_null() , "method should not be null");
  
    KlassHandle recv_klass; // Default to NULL (use of ?: can confuse gcc)
    if (recv.not_null()) recv_klass = KlassHandle(THREAD, recv->klass());
    KlassHandle spec_klass (THREAD, method->method_holder());
    Symbol*  name  = method->name();
    Symbol*  signature  = method->signature();
    CallInfo info;
    LinkResolver::resolve_interface_call(info, recv, recv_klass,  spec_klass, name, signature, KlassHandle(), false, true, CHECK_(methodHandle()));
    return info.selected_method();
  }
  
  static methodHandle jni_resolve_virtual_call(Handle recv, methodHandle method, TRAPS) {
    assert(!method.is_null() , "method should not be null");
  
    KlassHandle recv_klass; // Default to NULL (use of ?: can confuse gcc)
    if (recv.not_null()) recv_klass = KlassHandle(THREAD, recv->klass());
    KlassHandle spec_klass (THREAD, method->method_holder());
    Symbol*  name  = method->name();
    Symbol*  signature  = method->signature();
    CallInfo info;
    LinkResolver::resolve_virtual_call(info, recv, recv_klass,  spec_klass, name, signature, KlassHandle(), false, true, CHECK_(methodHandle()));
    return info.selected_method();
  }
  
  
  
  static void jni_invoke_static(JNIEnv *env, JavaValue* result, jobject receiver, JNICallType call_type, jmethodID method_id, JNI_ArgumentPusher *args, TRAPS) {
    methodHandle method(THREAD, Method::resolve_jmethod_id(method_id));
  

*** 5049,5058 ****
--- 5023,5033 ----
    unit_test_function_call
  
  void execute_internal_vm_tests() {
    if (ExecuteInternalVMTests) {
      tty->print_cr("Running internal VM tests");
+     run_unit_test(GlobalDefinitions::test_globals());
      run_unit_test(arrayOopDesc::test_max_array_length());
      run_unit_test(CollectedHeap::test_is_in());
      run_unit_test(QuickSort::test_quick_sort());
      run_unit_test(AltHashing::test_alt_hash());
      tty->print_cr("All internal VM tests passed");