comparison src/share/vm/jvmci/jvmciCodeInstaller.cpp @ 22147:32434ca987d7

fixed Windows build issues
author Doug Simon <doug.simon@oracle.com>
date Mon, 06 Jul 2015 00:25:01 +0200
parents ae67bd822493
children 76af33d4d504
comparison
equal deleted inserted replaced
22146:18480847a17b 22147:32434ca987d7
431 } else { 431 } else {
432 nmethod* nm = NULL; 432 nmethod* nm = NULL;
433 methodHandle method = getMethodFromHotSpotMethod(HotSpotCompiledNmethod::method(compiled_code)); 433 methodHandle method = getMethodFromHotSpotMethod(HotSpotCompiledNmethod::method(compiled_code));
434 jint entry_bci = HotSpotCompiledNmethod::entryBCI(compiled_code); 434 jint entry_bci = HotSpotCompiledNmethod::entryBCI(compiled_code);
435 jint id = HotSpotCompiledNmethod::id(compiled_code); 435 jint id = HotSpotCompiledNmethod::id(compiled_code);
436 jboolean has_unsafe_access = HotSpotCompiledNmethod::hasUnsafeAccess(compiled_code); 436 bool has_unsafe_access = HotSpotCompiledNmethod::hasUnsafeAccess(compiled_code) == JNI_TRUE;
437 JVMCIEnv* env = (JVMCIEnv*) (address) HotSpotCompiledNmethod::jvmciEnv(compiled_code); 437 JVMCIEnv* env = (JVMCIEnv*) (address) HotSpotCompiledNmethod::jvmciEnv(compiled_code);
438 if (id == -1) { 438 if (id == -1) {
439 // Make sure a valid compile_id is associated with every compile 439 // Make sure a valid compile_id is associated with every compile
440 id = CompileBroker::assign_compile_id_unlocked(Thread::current(), method, entry_bci); 440 id = CompileBroker::assign_compile_id_unlocked(Thread::current(), method, entry_bci);
441 } 441 }
442 result = JVMCIEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer, 442 result = JVMCIEnv::register_method(method, nm, entry_bci, &_offsets, _custom_stack_area_offset, &buffer,
443 stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table, 443 stack_slots, _debug_recorder->_oopmaps, &_exception_handler_table,
444 JVMCICompiler::instance(), _debug_recorder, _dependencies, env, id, 444 JVMCICompiler::instance(), _debug_recorder, _dependencies, env, id,
445 (bool) has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log); 445 has_unsafe_access, _has_wide_vector, installed_code, compiled_code, speculation_log);
446 cb = nm; 446 cb = nm;
447 } 447 }
448 448
449 if (cb != NULL) { 449 if (cb != NULL) {
450 // Make sure the pre-calculated constants section size was correct. 450 // Make sure the pre-calculated constants section size was correct.