Mercurial > hg > graal-compiler
changeset 13109:58dfd753ada8
fixed regression from recent hsx merge that prevented TypeProfileLevel from being enabled
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 22 Nov 2013 01:40:16 +0100 |
| parents | d84fa69a9874 |
| children | b96536453a74 |
| files | src/cpu/x86/vm/globals_x86.hpp src/cpu/x86/vm/templateTable_x86_64.cpp |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/x86/vm/globals_x86.hpp Fri Nov 22 01:30:06 2013 +0100 +++ b/src/cpu/x86/vm/globals_x86.hpp Fri Nov 22 01:40:16 2013 +0100 @@ -79,7 +79,7 @@ // GC Ergo Flags define_pd_global(uintx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread -define_pd_global(uintx, TypeProfileLevel, GRAALVM_ONLY(0) NOT_GRAALVM(111)); +define_pd_global(uintx, TypeProfileLevel, 111); #define ARCH_FLAGS(develop, product, diagnostic, experimental, notproduct) \ \
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp Fri Nov 22 01:30:06 2013 +0100 +++ b/src/cpu/x86/vm/templateTable_x86_64.cpp Fri Nov 22 01:40:16 2013 +0100 @@ -3043,11 +3043,11 @@ // get target Method* & entry point __ lookup_virtual_method(rax, index, method); - __ profile_arguments_type(rdx, method, r13, true); #ifdef GRAAL // r14: MethodDataPointer (r14 is callee saved) __ profile_called_method(method, r14, r13); #endif + __ profile_arguments_type(rdx, method, r13, true); __ jump_from_interpreted(method, rdx); } @@ -3147,15 +3147,15 @@ __ testptr(rbx, rbx); __ jcc(Assembler::zero, no_such_method); +#ifdef GRAAL + // r13: MethodDataPointer (r13 is callee saved) + __ profile_called_method(rbx, r13, r14); +#endif __ profile_arguments_type(rdx, rbx, r13, true); // do the call // rcx: receiver // rbx,: Method* -#ifdef GRAAL - // r13: MethodDataPointer (r13 is callee saved) - __ profile_called_method(rbx, r13, r14); -#endif __ jump_from_interpreted(rbx, rdx); __ should_not_reach_here();