archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8254598: StringDedupTable should use OopStorage

Browse source 
Co-authored-by: Kim Barrett <kbarrett@openjdk.org>
Co-authored-by: Zhengyu Gu <zgu@openjdk.org>
Reviewed-by: coleenp, iklam, tschatzl, ayang
This commit is contained in:
Kim Barrett 2021-05-14 18:38:58 +00:00
parent 360928d16d
commit be0a655208
97 changed files with 2399 additions and 3234 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/hotspot/share/classfile/javaClasses.hpp
View file

@ -96,12 +96,18 @@ class java_lang_Object : AllStatic {
// Interface to java.lang.String objects
// The flags field is a collection of bits representing boolean values used
// internally by the VM.
#define STRING_INJECTED_FIELDS(macro) \
macro(java_lang_String, flags, byte_signature, false)
class java_lang_String : AllStatic {
private:
static int _value_offset;
static int _hash_offset;
static int _hashIsZero_offset;
static int _coder_offset;
static int _flags_offset;
static bool _initialized;
@ -109,6 +115,19 @@ class java_lang_String : AllStatic {
static inline void set_coder(oop string, jbyte coder);
// Bitmasks for values in the injected flags field.
static const uint8_t _deduplication_forbidden_mask = 1 << 0;
static const uint8_t _deduplication_requested_mask = 1 << 1;
static int flags_offset() { CHECK_INIT(_flags_offset); }
// Return the address of the injected flags field.
static inline uint8_t* flags_addr(oop java_string);
// Test whether the designated bit of the injected flags field is set.
static inline bool is_flag_set(oop java_string, uint8_t flag_mask);
// Atomically test and set the designated bit of the injected flags field,
// returning true if the bit was already set.
static bool test_and_set_flag(oop java_string, uint8_t flag_mask);
public:
// Coders
@ -137,11 +156,26 @@ class java_lang_String : AllStatic {
static inline void set_value_raw(oop string, typeArrayOop buffer);
static inline void set_value(oop string, typeArrayOop buffer);
// Set the deduplication_forbidden flag true. This flag is sticky; once
// set it never gets cleared. This is set when a String is interned in
// the StringTable, to prevent string deduplication from changing the
// String's value array.
static inline void set_deduplication_forbidden(oop java_string);
// Test and set the deduplication_requested flag. Returns the old value
// of the flag. This flag is sticky; once set it never gets cleared.
// Some GCs may use this flag when deciding whether to request
// deduplication of a String, to avoid multiple requests for the same
// object.
static inline bool test_and_set_deduplication_requested(oop java_string);
// Accessors
static inline typeArrayOop value(oop java_string);
static inline typeArrayOop value_no_keepalive(oop java_string);
static inline bool hash_is_set(oop string);
static inline bool is_latin1(oop java_string);
static inline bool deduplication_forbidden(oop java_string);
static inline bool deduplication_requested(oop java_string);
static inline int length(oop java_string);
static inline int length(oop java_string, typeArrayOop string_value);
static int utf8_length(oop java_string);
@ -1735,6 +1769,7 @@ class InjectedField {
klass##_##name##_enum,
#define ALL_INJECTED_FIELDS(macro) \
STRING_INJECTED_FIELDS(macro) \
CLASS_INJECTED_FIELDS(macro) \
CLASSLOADER_INJECTED_FIELDS(macro) \
RESOLVEDMETHOD_INJECTED_FIELDS(macro) \