jdk-sandbox: comparison hotspot/src/share/vm/runtime/javaCalls.cpp

equal deleted inserted replaced

-:5bc48f22b149
+:a46a6c4d1dd9
 /*
-* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 if (alternative_target == NULL) {
 #endif
 // Verify the arguments
 if (CheckJNICalls)  {
-args->verify(method, result->get_type(), thread);
+args->verify(method, result->get_type());
 }
-else debug_only(args->verify(method, result->get_type(), thread));
+else debug_only(args->verify(method, result->get_type()));
 #if INCLUDE_JVMCI
 }
 #else
 // Ignore call if method is empty
 //--------------------------------------------------------------------------------------
 // Implementation of JavaCallArguments
+inline bool is_value_state_indirect_oop(uint state) {
+assert(state != JavaCallArguments::value_state_oop,
+"Checking for handles after removal");
+assert(state < JavaCallArguments::value_state_limit,
+"Invalid value state %u", state);
+return state != JavaCallArguments::value_state_primitive;
+}
+inline oop resolve_indirect_oop(intptr_t value, uint state) {
+switch (state) {
+case JavaCallArguments::value_state_handle:
+{
+oop* ptr = reinterpret_cast<oop*>(value);
+return Handle::raw_resolve(ptr);
+}
+case JavaCallArguments::value_state_jobject:
+{
+jobject obj = reinterpret_cast<jobject>(value);
+return JNIHandles::resolve(obj);
+}
+default:
+ShouldNotReachHere();
+return NULL;
+}
+}
 intptr_t* JavaCallArguments::parameters() {
 // First convert all handles to oops
 for(int i = 0; i < _size; i++) {
-if (_is_oop[i]) {
+uint state = _value_state[i];
-// Handle conversion
+assert(state != value_state_oop, "Multiple handle conversions");
-_value[i] = cast_from_oop<intptr_t>(Handle::raw_resolve((oop *)_value[i]));
+if (is_value_state_indirect_oop(state)) {
+oop obj = resolve_indirect_oop(_value[i], state);
+_value[i] = cast_from_oop<intptr_t>(obj);
+_value_state[i] = value_state_oop;
 }
 }
 // Return argument vector
 return _value;
 }
 class SignatureChekker : public SignatureIterator {
 private:
-bool *_is_oop;
+int _pos;
-int   _pos;
 BasicType _return_type;
-intptr_t*   _value;
+u_char* _value_state;
-Thread* _thread;
+intptr_t* _value;
 public:
 bool _is_return;
-SignatureChekker(Symbol* signature, BasicType return_type, bool is_static, bool* is_oop, intptr_t* value, Thread* thread) : SignatureIterator(signature) {
+SignatureChekker(Symbol* signature,
-_is_oop = is_oop;
+BasicType return_type,
-_is_return = false;
+bool is_static,
-_return_type = return_type;
+u_char* value_state,
-_pos = 0;
+intptr_t* value) :
-_value = value;
+SignatureIterator(signature),
-_thread = thread;
+_pos(0),
+_return_type(return_type),
+_value_state(value_state),
+_value(value),
+_is_return(false)
+{
 if (!is_static) {
 check_value(true); // Receiver must be an oop
 }
 }
 void check_value(bool type) {
-guarantee(_is_oop[_pos++] == type, "signature does not match pushed arguments");
+uint state = _value_state[_pos++];
+if (type) {
+guarantee(is_value_state_indirect_oop(state),
+"signature does not match pushed arguments: %u at %d",
+state, _pos - 1);
+} else {
+guarantee(state == JavaCallArguments::value_state_primitive,
+"signature does not match pushed arguments: %u at %d",
+state, _pos - 1);
+}
 }
 void check_doing_return(bool state) { _is_return = state; }
 void check_return_type(BasicType t) {
 if (_is_return) {
 check_return_type(t);
 return;
 }
-// verify handle and the oop pointed to by handle
+intptr_t v = _value[_pos];
-int p = _pos;
+if (v != 0) {
-bool bad = false;
+// v is a "handle" referring to an oop, cast to integral type.
-// If argument is oop
+// There shouldn't be any handles in very low memory.
-if (_is_oop[p]) {
+guarantee((size_t)v >= (size_t)os::vm_page_size(),
-intptr_t v = _value[p];
+"Bad JNI oop argument %d: " PTR_FORMAT, _pos, v);
-if (v != 0 ) {
+// Verify the pointee.
-size_t t = (size_t)v;
+oop vv = resolve_indirect_oop(v, _value_state[_pos]);
-bad = (t < (size_t)os::vm_page_size() ) || !Handle::raw_resolve((oop *)v)->is_oop_or_null(true);
+guarantee(vv->is_oop_or_null(true),
-if (CheckJNICalls && bad) {
+"Bad JNI oop argument %d: " PTR_FORMAT " -> " PTR_FORMAT,
-ReportJNIFatalError((JavaThread*)_thread, "Bad JNI oop argument");
+_pos, v, p2i(vv));
 }
-}
-// for the regular debug case.
+check_value(true);          // Verify value state.
-assert(!bad, "Bad JNI oop argument");
-}
-check_value(true);
 }
 void do_bool()                       { check_int(T_BOOLEAN);       }
 void do_char()                       { check_int(T_CHAR);          }
 void do_float()                      { check_int(T_FLOAT);         }
 void do_object(int begin, int end)   { check_obj(T_OBJECT);        }
 void do_array(int begin, int end)    { check_obj(T_OBJECT);        }
 };
-void JavaCallArguments::verify(const methodHandle& method, BasicType return_type,
+void JavaCallArguments::verify(const methodHandle& method, BasicType return_type) {
-Thread *thread) {
 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, return_type, method->is_static(),_is_oop, _value, thread);
+SignatureChekker sc(signature,
+return_type,
+method->is_static(),
+_value_state,
+_value);
 sc.iterate_parameters();
 sc.check_doing_return(true);
 sc.iterate_returntype();
 }

changeset 44406	a46a6c4d1dd9
parent 44093	e22e0d071bf9
child 44738	11431bbc9549
child 46369	3bf4544bec14