jdk-jdk Udiff src/hotspot/share/classfile/javaClasses.cpp (original) (raw)
rev 50507 : 8204965: Fix '--disable-cds' and disable CDS on AIX by default
@@ -768,19 +768,23 @@ break; case T_OBJECT: { assert(fd->signature() == vmSymbols::string_signature(), "just checking"); +#if INCLUDE_CDS_JAVA_HEAP if (DumpSharedSpaces && MetaspaceShared::is_archive_object(mirror())) { // Archive the String field and update the pointer. oop s = mirror()->obj_field(fd->offset()); oop archived_s = StringTable::create_archived_string(s, CHECK); mirror()->obj_field_put(fd->offset(), archived_s); } else { +#endif oop string = fd->string_initial_value(CHECK); mirror()->obj_field_put(fd->offset(), string); +#if INCLUDE_CDS_JAVA_HEAP } +#endif } break; default: THROW_MSG(vmSymbols::java_lang_ClassFormatError(), "Illegal ConstantValue attribute in class file");