Mercurial > hg > graal-compiler
diff src/share/vm/runtime/compilationPolicy.cpp @ 7226:8a3efb8c831d
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 14 Dec 2012 13:02:49 +0100 |
parents | fb16d8681ddc 5d0bb7d52783 |
children | bbf97d6688d3 |
line wrap: on
line diff
--- a/src/share/vm/runtime/compilationPolicy.cpp Fri Dec 14 12:05:35 2012 +0100 +++ b/src/share/vm/runtime/compilationPolicy.cpp Fri Dec 14 13:02:49 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(); @@ -505,12 +505,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; @@ -737,4 +737,4 @@ -#endif // COMPILER2 || GRAAL +#endif // COMPILER2