Mercurial > hg > truffle
diff src/share/vm/runtime/compilationPolicy.cpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sat, 17 Dec 2011 21:40:27 +0100 |
| parents | 409ef3a68dc8 2c359f27615c |
| children | 33df1aeaebbf |
line wrap: on
line diff
--- a/src/share/vm/runtime/compilationPolicy.cpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/runtime/compilationPolicy.cpp Sat Dec 17 21:40:27 2011 +0100 @@ -306,7 +306,7 @@ return (current >= initial + target); } -nmethod* NonTieredCompPolicy::event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, TRAPS) { +nmethod* NonTieredCompPolicy::event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS) { assert(comp_level == CompLevel_none, "This should be only called from the interpreter"); NOT_PRODUCT(trace_frequency_counter_overflow(method, branch_bci, bci)); if (JvmtiExport::can_post_interpreter_events()) {