comparison src/share/vm/graal/graalCompilerToVM.cpp @ 10588:b0b368d38b40

CR-1032 - change ExternalCompilationResult kernel -> entryPoint
author Morris Meyer <morris.meyer@oracle.com>
date Mon, 01 Jul 2013 15:46:27 -0400
parents 9c7d9e2c8326
children 72d0ea03635b
comparison
equal deleted inserted replaced
10587:e43bb3295475 10588:b0b368d38b40
969 if (!installed_code_handle.is_null()) { 969 if (!installed_code_handle.is_null()) {
970 assert(installed_code_handle->is_a(HotSpotInstalledCode::klass()), "wrong type"); 970 assert(installed_code_handle->is_a(HotSpotInstalledCode::klass()), "wrong type");
971 HotSpotInstalledCode::set_codeBlob(installed_code_handle, (jlong) cb); 971 HotSpotInstalledCode::set_codeBlob(installed_code_handle, (jlong) cb);
972 oop comp_result = HotSpotCompiledCode::comp(compiled_code_handle); 972 oop comp_result = HotSpotCompiledCode::comp(compiled_code_handle);
973 if (comp_result->is_a(ExternalCompilationResult::klass())) { 973 if (comp_result->is_a(ExternalCompilationResult::klass())) {
974 tty->print_cr("installCode0: ExternalCompilationResult"); 974 if (TraceWarpLoading) {
975 HotSpotInstalledCode::set_start(installed_code_handle, ExternalCompilationResult::kernel(comp_result)); 975 tty->print_cr("installCode0: ExternalCompilationResult");
976 }
977 HotSpotInstalledCode::set_start(installed_code_handle, ExternalCompilationResult::entryPoint(comp_result));
976 } else { 978 } else {
977 HotSpotInstalledCode::set_start(installed_code_handle, (jlong) cb->code_begin()); 979 HotSpotInstalledCode::set_start(installed_code_handle, (jlong) cb->code_begin());
978 } 980 }
979 nmethod* nm = cb->as_nmethod_or_null(); 981 nmethod* nm = cb->as_nmethod_or_null();
980 assert(nm == NULL || !installed_code_handle->is_scavengable() || nm->on_scavenge_root_list(), "nm should be scavengable if installed_code is scavengable"); 982 assert(nm == NULL || !installed_code_handle->is_scavengable() || nm->on_scavenge_root_list(), "nm should be scavengable if installed_code is scavengable");