Mercurial > hg > truffle
diff src/share/vm/runtime/javaCalls.cpp @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Sat, 17 Dec 2011 21:40:27 +0100 |
| parents | be4ca325525a f08d439fab8c |
| children | 1b8d02e10ee8 |
line wrap: on
line diff
--- a/src/share/vm/runtime/javaCalls.cpp Sat Dec 17 20:50:09 2011 +0100 +++ b/src/share/vm/runtime/javaCalls.cpp Sat Dec 17 21:40:27 2011 +0100 @@ -48,6 +48,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" #endif +#ifdef TARGET_OS_FAMILY_bsd +# include "thread_bsd.inline.hpp" +#endif // ----------------------------------------------------- // Implementation of JavaCallWrapper @@ -374,7 +377,7 @@ //assert(!thread->is_Compiler_thread(), "cannot compile from the compiler"); if (CompilationPolicy::must_be_compiled(method)) { CompileBroker::compile_method(method, InvocationEntryBci, - CompLevel_initial_compile, + CompilationPolicy::policy()->initial_compile_level(), methodHandle(), 0, "must_be_compiled", CHECK); } @@ -576,4 +579,3 @@ sc.check_doing_return(true); sc.iterate_returntype(); } -