Mercurial > hg > graal-compiler
changeset 10641:4b88e5c93f04
Minor C++ compilation fixes.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Mon, 08 Jul 2013 17:14:25 +0200 |
parents | 88672775a26c |
children | 678cdd287d60 |
files | src/cpu/x86/vm/templateInterpreter_x86_64.cpp src/share/vm/graal/graalCompiler.cpp |
diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Mon Jul 08 16:55:28 2013 +0200 +++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp Mon Jul 08 17:14:25 2013 +0200 @@ -304,7 +304,7 @@ // Helpers for commoning out cases in the various type of method entries. // -#ifdef GRAAL +#ifdef GRAALVM void graal_initialize_time(JavaThread* thread) { assert(ProfileInterpreter, "must be profiling interpreter"); @@ -314,7 +314,7 @@ fr.interpreter_frame_method()->method_counters()->set_graal_invocation_time(os::javaTimeNanos()); } -#endif // GRAAL +#endif // GRAALVM // increment invocation count & check for overflow // @@ -369,7 +369,7 @@ MethodCounters::interpreter_invocation_counter_offset())); } -#ifdef GRAAL +#ifdef GRAALVM if (CompilationPolicyChoice == 4) { Label not_zero; __ testl(rcx, InvocationCounter::count_mask_value); @@ -391,7 +391,7 @@ __ bind(not_zero); } -#endif // GRAAL +#endif // GRAALVM // Update standard invocation counters __ movl(rcx, invocation_counter);
--- a/src/share/vm/graal/graalCompiler.cpp Mon Jul 08 16:55:28 2013 +0200 +++ b/src/share/vm/graal/graalCompiler.cpp Mon Jul 08 17:14:25 2013 +0200 @@ -171,8 +171,8 @@ ResourceMark rm; JavaThread::current()->set_is_compiling(true); Handle holder = GraalCompiler::createHotSpotResolvedObjectType(method, CHECK); - MethodCounters* mcs = method->method_counters(); - VMToCompiler::compileMethod(method(), holder, entry_bci, blocking, mcs->graal_priority()); + int priority = GRAALVM_ONLY(method->method_counters()->graal_priority()) NOT_GRAALVM(0); + VMToCompiler::compileMethod(method(), holder, entry_bci, blocking, priority); JavaThread::current()->set_is_compiling(false); }