Mercurial > hg > graal-jvmci-8
comparison 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 |
comparison
equal
deleted
inserted
replaced
17809:a433eb716ce1 | 17810:62c54fcc0a35 |
---|---|
479 _jmethod_id = NULL; | 479 _jmethod_id = NULL; |
480 _osr_link = NULL; | 480 _osr_link = NULL; |
481 _scavenge_root_link = NULL; | 481 _scavenge_root_link = NULL; |
482 _scavenge_root_state = 0; | 482 _scavenge_root_state = 0; |
483 _compiler = NULL; | 483 _compiler = NULL; |
484 | 484 #if INCLUDE_RTM_OPT |
485 _rtm_state = NoRTM; | |
486 #endif | |
485 #ifdef HAVE_DTRACE_H | 487 #ifdef HAVE_DTRACE_H |
486 _trap_offset = 0; | 488 _trap_offset = 0; |
487 #endif // def HAVE_DTRACE_H | 489 #endif // def HAVE_DTRACE_H |
488 } | 490 } |
489 | 491 |