Mercurial > hg > truffle
changeset 18527:b31ae5af9fa3
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 26 Nov 2014 12:51:31 +0100 |
parents | be44c1ca8f00 (current diff) 99e5d0a7600e (diff) |
children | c240024b32b3 |
files | |
diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/oops/methodData.hpp Wed Nov 26 12:05:56 2014 +0100 +++ b/src/share/vm/oops/methodData.hpp Wed Nov 26 12:51:31 2014 +0100 @@ -2163,7 +2163,7 @@ // Whole-method sticky bits and flags enum { - _trap_hist_limit = 19 GRAAL_ONLY(+2), // decoupled from Deoptimization::Reason_LIMIT + _trap_hist_limit = 19 GRAAL_ONLY(+5), // decoupled from Deoptimization::Reason_LIMIT _trap_hist_mask = max_jubyte, _extra_data_count = 4 // extra DataLayout headers, for trap history }; // Public flag values @@ -2173,11 +2173,7 @@ uint _nof_overflow_traps; // trap count, excluding _trap_hist union { intptr_t _align; -#ifdef GRAAL - u1 _array[2*_trap_hist_limit]; -#else - u1 _array[_trap_hist_limit]; -#endif + u1 _array[GRAAL_ONLY(2*)_trap_hist_limit]; } _trap_hist; // Support for interprocedural escape analysis, from Thomas Kotzmann.