1.1 --- a/src/share/vm/interpreter/oopMapCache.hpp Fri Mar 27 02:17:16 2015 +0000
1.2 +++ b/src/share/vm/interpreter/oopMapCache.hpp Thu Mar 26 23:17:09 2015 -0700
1.3 @@ -66,19 +66,15 @@
1.4
1.5 public:
1.6 enum {
1.7 - N = 2, // the number of words reserved
1.8 + N = 4, // the number of words reserved
1.9 // for inlined mask storage
1.10 small_mask_limit = N * BitsPerWord, // the maximum number of bits
1.11 // available for small masks,
1.12 // small_mask_limit can be set to 0
1.13 // for testing bit_mask allocation
1.14
1.15 -#ifdef ENABLE_ZAP_DEAD_LOCALS
1.16 bits_per_entry = 2,
1.17 dead_bit_number = 1,
1.18 -#else
1.19 - bits_per_entry = 1,
1.20 -#endif
1.21 oop_bit_number = 0
1.22 };
1.23
1.24 @@ -119,10 +115,6 @@
1.25
1.26 void set_expression_stack_size(int sz) { _expression_stack_size = sz; }
1.27
1.28 -#ifdef ENABLE_ZAP_DEAD_LOCALS
1.29 - bool is_dead(int offset) const { return (entry_at(offset) & (1 << dead_bit_number)) != 0; }
1.30 -#endif
1.31 -
1.32 // Lookup
1.33 bool match(methodHandle method, int bci) const { return _method == method() && _bci == bci; }
1.34 bool is_empty() const;
1.35 @@ -144,6 +136,7 @@
1.36 void print() const;
1.37
1.38 int number_of_entries() const { return mask_size() / bits_per_entry; }
1.39 + bool is_dead(int offset) const { return (entry_at(offset) & (1 << dead_bit_number)) != 0; }
1.40 bool is_oop (int offset) const { return (entry_at(offset) & (1 << oop_bit_number )) != 0; }
1.41
1.42 int expression_stack_size() const { return _expression_stack_size; }
