Mercurial > hg > graal-jvmci-8
diff src/share/vm/code/nmethod.cpp @ 17810:62c54fcc0a35
Merge
author | kvn |
---|---|
date | Tue, 25 Mar 2014 17:07:36 -0700 |
parents | 5da8bb64b370 606acabe7b5c |
children | e0a77b91da68 |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Tue Mar 25 12:54:21 2014 -0700 +++ b/src/share/vm/code/nmethod.cpp Tue Mar 25 17:07:36 2014 -0700 @@ -481,7 +481,9 @@ _scavenge_root_link = NULL; _scavenge_root_state = 0; _compiler = NULL; - +#if INCLUDE_RTM_OPT + _rtm_state = NoRTM; +#endif #ifdef HAVE_DTRACE_H _trap_offset = 0; #endif // def HAVE_DTRACE_H