comparison src/share/vm/ci/ciEnv.cpp @ 17782:18f752639eb2

8038286: nm->set_rtm_state() should be called after (nm != NULL) check Summary: move set_rtm_state() call after (nm != NULL) check Reviewed-by: iveresov, twisti
author kvn
date Mon, 24 Mar 2014 17:44:27 -0700
parents 606acabe7b5c
children 78bbf4d43a14
comparison
equal deleted inserted replaced
17781:52b37289e3be 17782:18f752639eb2
1007 orig_pc_offset, 1007 orig_pc_offset,
1008 debug_info(), dependencies(), code_buffer, 1008 debug_info(), dependencies(), code_buffer,
1009 frame_words, oop_map_set, 1009 frame_words, oop_map_set,
1010 handler_table, inc_table, 1010 handler_table, inc_table,
1011 compiler, comp_level); 1011 compiler, comp_level);
1012 #if INCLUDE_RTM_OPT
1013 nm->set_rtm_state(rtm_state);
1014 #endif
1015 // Free codeBlobs 1012 // Free codeBlobs
1016 code_buffer->free_blob(); 1013 code_buffer->free_blob();
1017 1014
1018 if (nm != NULL) { 1015 if (nm != NULL) {
1019 nm->set_has_unsafe_access(has_unsafe_access); 1016 nm->set_has_unsafe_access(has_unsafe_access);
1020 nm->set_has_wide_vectors(has_wide_vectors); 1017 nm->set_has_wide_vectors(has_wide_vectors);
1018 #if INCLUDE_RTM_OPT
1019 nm->set_rtm_state(rtm_state);
1020 #endif
1021 1021
1022 // Record successful registration. 1022 // Record successful registration.
1023 // (Put nm into the task handle *before* publishing to the Java heap.) 1023 // (Put nm into the task handle *before* publishing to the Java heap.)
1024 if (task() != NULL) { 1024 if (task() != NULL) {
1025 task()->set_code(nm); 1025 task()->set_code(nm);