Mercurial > hg > truffle
diff src/cpu/x86/vm/interp_masm_x86_64.cpp @ 4656:c1160de36474
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 20 Feb 2012 18:01:22 +0100 |
parents | 723df37192d6 |
children | 957c266d8bc5 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/interp_masm_x86_64.cpp Mon Feb 20 17:58:46 2012 +0100 +++ b/src/cpu/x86/vm/interp_masm_x86_64.cpp Mon Feb 20 18:01:22 2012 +0100 @@ -1126,8 +1126,12 @@ Register receiver, Register mdp, Register reg2, int start_row, Label& done, bool is_virtual_call) { +#ifdef GRAAL // change for GRAAL (use counter to indicate polymorphic case instead of failed typechecks) - bool use_counter_for_polymorphic_case = is_virtual_call || UseGraal; + bool use_counter_for_polymorphic_case = true; +#else + bool use_counter_for_polymorphic_case = is_virtual_call; +#endif if (TypeProfileWidth == 0) { if (use_counter_for_polymorphic_case) { @@ -1300,8 +1304,9 @@ void InterpreterMacroAssembler::profile_typecheck_failed(Register mdp) { - // changed for GRAAL (use counter to indicate polymorphism instead of failed typechecks) - if (ProfileInterpreter && TypeProfileCasts && !UseGraal) { +// changed for GRAAL (use counter to indicate polymorphism instead of failed typechecks) +#ifndef GRAAL + if (ProfileInterpreter && TypeProfileCasts) { Label profile_continue; // If no method data exists, go to profile_continue. @@ -1316,6 +1321,7 @@ bind (profile_continue); } +#endif }