src/hotspot/share/runtime/javaCalls.cpp

*** 388,398 ****
    }
  
    // 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);
  
    // Find receiver
    Handle receiver = (!method->is_static()) ? args->receiver() : Handle();
  
    // When we reenter Java, we need to reenable the reserved/yellow zone which
--- 388,398 ----
    }
  
    // 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 = is_reference_type(result->get_type());
  
    // Find receiver
    Handle receiver = (!method->is_static()) ? args->receiver() : Handle();
  
    // When we reenter Java, we need to reenable the reserved/yellow zone which
*** 617,627 ****
  
  void JavaCallArguments::verify(const methodHandle& method, BasicType return_type) {
    guarantee(method->size_of_parameters() == size_of_parameters(), "wrong no. of arguments pushed");
  
    // Treat T_OBJECT and T_ARRAY as the same
!   if (return_type == T_ARRAY) return_type = T_OBJECT;
  
    // Check that oop information is correct
    Symbol* signature = method->signature();
  
    SignatureChekker sc(signature,
--- 617,627 ----
  
  void JavaCallArguments::verify(const methodHandle& method, BasicType return_type) {
    guarantee(method->size_of_parameters() == size_of_parameters(), "wrong no. of arguments pushed");
  
    // Treat T_OBJECT and T_ARRAY as the same
!   if (is_reference_type(return_type)) return_type = T_OBJECT;
  
    // Check that oop information is correct
    Symbol* signature = method->signature();
  
    SignatureChekker sc(signature,