src/hotspot/share/runtime/javaCalls.cpp

*** 344,356 ****
    assert(thread->is_Java_thread(), "must be called by a java thread");
    assert(method.not_null(), "must have a method to call");
    assert(!SafepointSynchronize::is_at_safepoint(), "call to Java code during VM operation");
    assert(!thread->handle_area()->no_handle_mark_active(), "cannot call out to Java here");
  
- 
-   CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops();)
- 
  #if INCLUDE_JVMCI
    // Gets the nmethod (if any) that should be called instead of normal target
    nmethod* alternative_target = args->alternative_target();
    if (alternative_target == NULL) {
  #endif
--- 344,353 ----
*** 393,406 ****
    // Figure out if the result value is an oop or not (Note: This is a different value
    // than result_type. result_type will be T_INT of oops. (it is about size)
    BasicType result_type = runtime_type_from(result);
    bool oop_result_flag = (result->get_type() == T_OBJECT || result->get_type() == T_ARRAY);
  
-   // NOTE: if we move the computation of the result_val_address inside
-   // the call to call_stub, the optimizer produces wrong code.
-   intptr_t* result_val_address = (intptr_t*)(result->get_value_addr());
- 
    // Find receiver
    Handle receiver = (!method->is_static()) ? args->receiver() : Handle();
  
    // When we reenter Java, we need to reenable the reserved/yellow zone which
    // might already be disabled when we are in VM.
--- 390,399 ----
*** 434,451 ****
  
    // do call
    { JavaCallWrapper link(method, receiver, result, CHECK);
      { HandleMark hm(thread);  // HandleMark used by HandleMarkCleaner
  
        StubRoutines::call_stub()(
          (address)&link,
          // (intptr_t*)&(result->_value), // see NOTE above (compiler problem)
          result_val_address,          // see NOTE above (compiler problem)
          result_type,
          method(),
          entry_point,
!         args->parameters(),
          args->size_of_parameters(),
          CHECK
        );
  
        result = link.result();  // circumvent MS C++ 5.0 compiler bug (result is clobbered across call)
--- 427,449 ----
  
    // do call
    { JavaCallWrapper link(method, receiver, result, CHECK);
      { HandleMark hm(thread);  // HandleMark used by HandleMarkCleaner
  
+       // NOTE: if we move the computation of the result_val_address inside
+       // the call to call_stub, the optimizer produces wrong code.
+       intptr_t* result_val_address = (intptr_t*)(result->get_value_addr());
+       intptr_t* parameter_address = args->parameters();
+ 
        StubRoutines::call_stub()(
          (address)&link,
          // (intptr_t*)&(result->_value), // see NOTE above (compiler problem)
          result_val_address,          // see NOTE above (compiler problem)
          result_type,
          method(),
          entry_point,
!         parameter_address,
          args->size_of_parameters(),
          CHECK
        );
  
        result = link.result();  // circumvent MS C++ 5.0 compiler bug (result is clobbered across call)