Mercurial > hg > truffle
diff src/share/vm/runtime/compilationPolicy.cpp @ 7154:5d0bb7d52783
changes to support Graal co-existing with the other HotSpot compiler(s) and being used for explicit compilation requests and code installation via the Graal API
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 12 Dec 2012 21:36:40 +0100 |
| parents | 1baf7f1e3f23 |
| children | 8a3efb8c831d |
line wrap: on
line diff
--- a/src/share/vm/runtime/compilationPolicy.cpp Wed Dec 12 15:46:11 2012 +0100 +++ b/src/share/vm/runtime/compilationPolicy.cpp Wed Dec 12 21:36:40 2012 +0100 @@ -60,7 +60,7 @@ break; case 1: -#if defined(COMPILER2) || defined(GRAAL) +#if defined(COMPILER2) CompilationPolicy::set_policy(new StackWalkCompPolicy()); #else Unimplemented(); @@ -81,7 +81,7 @@ #endif break; case 4: -#if defined(GRAAL) +#if defined(GRAALVM) CompilationPolicy::set_policy(new GraalCompPolicy()); #else Unimplemented(); @@ -188,7 +188,7 @@ #endif #ifdef COMPILER1 - GRAAL_ONLY(ShouldNotReachHere();) + GRAALVM_ONLY(ShouldNotReachHere();) if (is_c1_compile(comp_level)) { return _compiler_count; } else { @@ -442,7 +442,7 @@ // GraalCompPolicy - compile current method -#ifdef GRAAL +#ifdef GRAALVM void GraalCompPolicy::method_invocation_event(methodHandle m, JavaThread* thread) { int hot_count = m->invocation_count(); @@ -499,12 +499,12 @@ } } -#endif // GRAAL +#endif // GRAALVM // StackWalkCompPolicy - walk up stack to find a suitable method to compile -#if defined(COMPILER2) || defined(GRAAL) +#if defined(COMPILER2) const char* StackWalkCompPolicy::_msg = NULL; @@ -731,4 +731,4 @@ -#endif // COMPILER2 || GRAAL +#endif // COMPILER2