# HG changeset patch # User Christos Kotselidis # Date 1381786571 -7200 # Node ID 738023c641c2e732708416a7d1d4359bf1e54a31 # Parent 1c4e9cb77ac681f85744df31f89570cfcd6f95f6 Fix in G1 GC after latest HotSpot merge diff -r 1c4e9cb77ac6 -r 738023c641c2 src/share/vm/code/nmethod.cpp --- a/src/share/vm/code/nmethod.cpp Mon Oct 14 23:35:49 2013 +0200 +++ b/src/share/vm/code/nmethod.cpp Mon Oct 14 23:36:11 2013 +0200 @@ -1405,13 +1405,6 @@ // cache call. if (!is_osr_method() && !is_not_entrant()) { address stub = SharedRuntime::get_handle_wrong_method_stub(); -#ifdef GRAAL - if (_graal_installed_code != NULL) { - // Break the link between nmethod and HotSpotInstalledCode such that the nmethod can subsequently be flushed safely. - HotSpotInstalledCode::set_codeBlob(_graal_installed_code, 0); - _graal_installed_code = NULL; - } -#endif NativeJump::patch_verified_entry(entry_point(), verified_entry_point(), stub); }