comparison src/share/vm/jvmci/jvmciCompilerToVM.cpp @ 21561:ce2113326bc8

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 17:13:22 +0200
parents src/share/vm/graal/graalCompilerToVM.cpp@5cbaf1e9ff2e src/share/vm/graal/graalCompilerToVM.cpp@be896a1983c0
children 36cf15e3219e
comparison
equal deleted inserted replaced
21560:a9fba0dfb155 21561:ce2113326bc8
500 } else { 500 } else {
501 if (!installed_code_handle.is_null()) { 501 if (!installed_code_handle.is_null()) {
502 assert(installed_code_handle->is_a(InstalledCode::klass()), "wrong type"); 502 assert(installed_code_handle->is_a(InstalledCode::klass()), "wrong type");
503 InstalledCode::set_address(installed_code_handle, (jlong) cb); 503 InstalledCode::set_address(installed_code_handle, (jlong) cb);
504 InstalledCode::set_version(installed_code_handle, InstalledCode::version(installed_code_handle) + 1); 504 InstalledCode::set_version(installed_code_handle, InstalledCode::version(installed_code_handle) + 1);
505 oop comp_result = HotSpotCompiledCode::comp(compiled_code_handle);
506 if (installed_code_handle->is_a(HotSpotInstalledCode::klass())) { 505 if (installed_code_handle->is_a(HotSpotInstalledCode::klass())) {
507 HotSpotInstalledCode::set_size(installed_code_handle, cb->size()); 506 HotSpotInstalledCode::set_size(installed_code_handle, cb->size());
508 HotSpotInstalledCode::set_codeStart(installed_code_handle, (jlong) cb->code_begin()); 507 HotSpotInstalledCode::set_codeStart(installed_code_handle, (jlong) cb->code_begin());
509 HotSpotInstalledCode::set_codeSize(installed_code_handle, cb->code_size()); 508 HotSpotInstalledCode::set_codeSize(installed_code_handle, cb->code_size());
510 } 509 }