Mercurial > hg > graal-jvmci-8

comparison src/share/vm/graal/graalCompilerToVM.cpp @ 21144:b7f05f4ca66e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix code install assertions to work with G1
author iveresov
date Tue, 28 Apr 2015 17:21:33 -0700
parents 294ed4ce1fa0
children 84b3d688ea83
comparison
equal deleted inserted replaced
21143:e13c65f874e5 21144:b7f05f4ca66e
507 HotSpotInstalledCode::set_size(installed_code_handle, cb->size()); 507 HotSpotInstalledCode::set_size(installed_code_handle, cb->size());
508 HotSpotInstalledCode::set_codeStart(installed_code_handle, (jlong) cb->code_begin()); 508 HotSpotInstalledCode::set_codeStart(installed_code_handle, (jlong) cb->code_begin());
509 HotSpotInstalledCode::set_codeSize(installed_code_handle, cb->code_size()); 509 HotSpotInstalledCode::set_codeSize(installed_code_handle, cb->code_size());
510 } 510 }
511 nmethod* nm = cb->as_nmethod_or_null(); 511 nmethod* nm = cb->as_nmethod_or_null();
512 assert(nm == NULL || !installed_code_handle->is_scavengable() || nm->on_scavenge_root_list(), "nm should be scavengable if installed_code is scavengable"); 512 if (nm != NULL && installed_code_handle->is_scavengable()) {
513 assert(nm->detect_scavenge_root_oops(), "nm should be scavengable if installed_code is scavengable");
514 if (!UseG1GC) {
515 assert(nm->on_scavenge_root_list(), "nm should be on scavengable list");
516 }
517 }
513 } 518 }
514 } 519 }
515 return result; 520 return result;
516 C2V_END 521 C2V_END
517 522