Mercurial > hg > truffle

comparison src/share/vm/code/nmethod.cpp @ 9707:cf0e31151830

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Tue, 14 May 2013 10:18:31 +0200
parents 197426668a5d fe9a18fbb15e
children 7bd4a69b4ce1
comparison
equal deleted inserted replaced
9706:f44d7e24cebd 9707:cf0e31151830
1397 // The caller can be calling the method statically or through an inline 1397 // The caller can be calling the method statically or through an inline
1398 // cache call. 1398 // cache call.
1399 if (!is_osr_method() && !is_not_entrant()) { 1399 if (!is_osr_method() && !is_not_entrant()) {
1400 address stub = SharedRuntime::get_handle_wrong_method_stub(); 1400 address stub = SharedRuntime::get_handle_wrong_method_stub();
1401 #ifdef GRAAL 1401 #ifdef GRAAL
1402 if (_graal_installed_code != NULL && !HotSpotInstalledCode::isDefault(_graal_installed_code)) { 1402 if (_graal_installed_code != NULL && !HotSpotNmethod::isDefault(_graal_installed_code)) {
1403 // This was manually installed machine code. Patch entry with stub that throws an exception. 1403 // This was manually installed machine code. Patch entry with stub that throws an exception.
1404 stub = SharedRuntime::get_deoptimized_installed_code_stub(); 1404 stub = SharedRuntime::get_deoptimized_installed_code_stub();
1405 } 1405 }
1406 #endif 1406 #endif
1407 NativeJump::patch_verified_entry(entry_point(), verified_entry_point(), stub); 1407 NativeJump::patch_verified_entry(entry_point(), verified_entry_point(), stub);
1694 } 1694 }
1695 1695
1696 #ifdef GRAAL 1696 #ifdef GRAAL
1697 // Follow Graal method 1697 // Follow Graal method
1698 if (_graal_installed_code != NULL) { 1698 if (_graal_installed_code != NULL) {
1699 if (HotSpotInstalledCode::isDefault(_graal_installed_code)) { 1699 if (HotSpotNmethod::isDefault(_graal_installed_code)) {
1700 if (!is_alive->do_object_b(_graal_installed_code)) { 1700 if (!is_alive->do_object_b(_graal_installed_code)) {
1701 _graal_installed_code = NULL; 1701 _graal_installed_code = NULL;
1702 } 1702 }
1703 } else { 1703 } else {
1704 if (can_unload(is_alive, (oop*)&_graal_installed_code, unloading_occurred)) { 1704 if (can_unload(is_alive, (oop*)&_graal_installed_code, unloading_occurred)) {