comparison src/share/vm/runtime/javaCalls.cpp @ 20804:7848fc12602b

Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 96ec4e5d3292 6e0cb14ce59b
children 48c1ebd24120
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
327 // stack that has installed its own exception handlers 327 // stack that has installed its own exception handlers
328 os::os_exception_wrapper(call_helper, result, &method, args, THREAD); 328 os::os_exception_wrapper(call_helper, result, &method, args, THREAD);
329 } 329 }
330 330
331 void JavaCalls::call_helper(JavaValue* result, methodHandle* m, JavaCallArguments* args, TRAPS) { 331 void JavaCalls::call_helper(JavaValue* result, methodHandle* m, JavaCallArguments* args, TRAPS) {
332 // During dumping, Java execution environment is not fully initialized. Also, Java execution
333 // may cause undesirable side-effects in the class metadata.
334 assert(!DumpSharedSpaces, "must not execute Java bytecodes when dumping");
335
332 methodHandle method = *m; 336 methodHandle method = *m;
333 JavaThread* thread = (JavaThread*)THREAD; 337 JavaThread* thread = (JavaThread*)THREAD;
334 assert(thread->is_Java_thread(), "must be called by a java thread"); 338 assert(thread->is_Java_thread(), "must be called by a java thread");
335 assert(method.not_null(), "must have a method to call"); 339 assert(method.not_null(), "must have a method to call");
336 assert(!SafepointSynchronize::is_at_safepoint(), "call to Java code during VM operation"); 340 assert(!SafepointSynchronize::is_at_safepoint(), "call to Java code during VM operation");