changeset 23496:bfdd90c07bf8

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 f222fac90da2
children 102f7bcc574b
files hotspot/src/share/vm/ci/ciEnv.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/ci/ciEnv.cpp	Mon Mar 24 08:43:10 2014 -0700
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp	Mon Mar 24 17:44:27 2014 -0700
@@ -1038,15 +1038,15 @@
                                frame_words, oop_map_set,
                                handler_table, inc_table,
                                compiler, comp_level);
-#if INCLUDE_RTM_OPT
-    nm->set_rtm_state(rtm_state);
-#endif
     // Free codeBlobs
     code_buffer->free_blob();
 
     if (nm != NULL) {
       nm->set_has_unsafe_access(has_unsafe_access);
       nm->set_has_wide_vectors(has_wide_vectors);
+#if INCLUDE_RTM_OPT
+      nm->set_rtm_state(rtm_state);
+#endif
 
       // Record successful registration.
       // (Put nm into the task handle *before* publishing to the Java heap.)