archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 12:04:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8038286: nm->set_rtm_state() should be called after (nm != NULL) check

Browse source 
Move set_rtm_state() call after (nm != NULL) check

Reviewed-by: iveresov, twisti
This commit is contained in:
Vladimir Kozlov 2014-03-24 17:44:27 -07:00
parent 1516f610a1
commit 04e8f32451
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/ci/ciEnv.cpp
View file

@ -1038,15 +1038,15 @@ void ciEnv::register_method(ciMethod* target,
frame_words, oop_map_set, frame_words, oop_map_set,
handler_table, inc_table, handler_table, inc_table,
compiler, comp_level); compiler, comp_level);
#if INCLUDE_RTM_OPT
nm->set_rtm_state(rtm_state);
#endif
// Free codeBlobs // Free codeBlobs
code_buffer->free_blob(); code_buffer->free_blob();
if (nm != NULL) { if (nm != NULL) {
nm->set_has_unsafe_access(has_unsafe_access); nm->set_has_unsafe_access(has_unsafe_access);
nm->set_has_wide_vectors(has_wide_vectors); nm->set_has_wide_vectors(has_wide_vectors);
#if INCLUDE_RTM_OPT
nm->set_rtm_state(rtm_state);
#endif
// Record successful registration. // Record successful registration.
// (Put nm into the task handle *before* publishing to the Java heap.) // (Put nm into the task handle *before* publishing to the Java heap.)