8253496: [BACKOUT] JDK-8253208 Move CDS related code to a separate class

Reviewed-by: eosterlund, dcubed
This commit is contained in:
Ioi Lam 2020-09-22 20:15:01 +00:00
parent 581f0f2643
commit 65af837391
22 changed files with 99 additions and 103 deletions

View file

@ -32,7 +32,7 @@
package sun.util.locale;
import jdk.internal.misc.CDS;
import jdk.internal.misc.VM;
import jdk.internal.vm.annotation.Stable;
import java.lang.ref.SoftReference;
@ -62,7 +62,7 @@ public final class BaseLocale {
ROOT = 18,
NUM_CONSTANTS = 19;
static {
CDS.initializeFromArchive(BaseLocale.class);
VM.initializeFromArchive(BaseLocale.class);
BaseLocale[] baseLocales = constantBaseLocales;
if (baseLocales == null) {
baseLocales = new BaseLocale[NUM_CONSTANTS];