1.1 --- a/src/share/vm/oops/cpCache.hpp Mon Jan 11 13:41:45 2016 -0800
1.2 +++ b/src/share/vm/oops/cpCache.hpp Fri Jan 15 22:33:15 2016 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -77,18 +77,19 @@
1.11 // f2 flag true if f2 contains an oop (e.g., virtual final method)
1.12 // fv flag true if invokeinterface used for method in class Object
1.13 //
1.14 -// The flags 31, 30, 29, 28 together build a 4 bit number 0 to 8 with the
1.15 +// The flags 31, 30, 29, 28 together build a 4 bit number 0 to 16 with the
1.16 // following mapping to the TosState states:
1.17 //
1.18 // btos: 0
1.19 -// ctos: 1
1.20 -// stos: 2
1.21 -// itos: 3
1.22 -// ltos: 4
1.23 -// ftos: 5
1.24 -// dtos: 6
1.25 -// atos: 7
1.26 -// vtos: 8
1.27 +// ztos: 1
1.28 +// ctos: 2
1.29 +// stos: 3
1.30 +// itos: 4
1.31 +// ltos: 5
1.32 +// ftos: 6
1.33 +// dtos: 7
1.34 +// atos: 8
1.35 +// vtos: 9
1.36 //
1.37 // Entry specific: field entries:
1.38 // _indices = get (b1 section) and put (b2 section) bytecodes, original constant pool index
1.39 @@ -351,14 +352,8 @@
1.40 bool has_method_type() const { return (!is_f1_null()) && (_flags & (1 << has_method_type_shift)) != 0; }
1.41 bool is_method_entry() const { return (_flags & (1 << is_field_entry_shift)) == 0; }
1.42 bool is_field_entry() const { return (_flags & (1 << is_field_entry_shift)) != 0; }
1.43 - bool is_byte() const { return flag_state() == btos; }
1.44 - bool is_char() const { return flag_state() == ctos; }
1.45 - bool is_short() const { return flag_state() == stos; }
1.46 - bool is_int() const { return flag_state() == itos; }
1.47 bool is_long() const { return flag_state() == ltos; }
1.48 - bool is_float() const { return flag_state() == ftos; }
1.49 bool is_double() const { return flag_state() == dtos; }
1.50 - bool is_object() const { return flag_state() == atos; }
1.51 TosState flag_state() const { assert((uint)number_of_states <= (uint)tos_state_mask+1, "");
1.52 return (TosState)((_flags >> tos_state_shift) & tos_state_mask); }
1.53
