Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke
duke committed May 15, 2020
2 parents 6744b5d + 150d6cf commit 16fbda20128233915b10a9aa161c429f8607880c
@@ -2283,6 +2283,10 @@ public MethodHandle stringConcatHelper(String name, MethodType methodType) {
return StringConcatHelper.lookupStatic(name, methodType);
}

public long stringConcatInitialCoder() {
return StringConcatHelper.initialCoder();
}

public Object classData(Class<?> c) {
return c.getClassData();
}
@@ -1724,12 +1724,7 @@ public MethodHandle apply(Class<?> c) {
private static final long INITIAL_CODER;

static {
try {
MethodHandle initCoder = JLA.stringConcatHelper("initialCoder", methodType(long.class));
INITIAL_CODER = (long) initCoder.invoke();
} catch (Throwable e) {
throw new AssertionError(e);
}
INITIAL_CODER = JLA.stringConcatInitialCoder();

PREPENDERS = new ConcurrentHashMap<>();
MIXERS = new ConcurrentHashMap<>();
@@ -333,6 +333,11 @@
*/
MethodHandle stringConcatHelper(String name, MethodType methodType);

/**
* Get the string concat initial coder
*/
long stringConcatInitialCoder();

/*
* Get the class data associated with the given class.
* @param c the class

0 comments on commit 16fbda2

Please sign in to comment.
You can’t perform that action at this time.