Skip to content

Commit 0229649

Browse files
committed
Introduce constants in LambdaUtils for serialization tests
1 parent 2ebe520 commit 0229649

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LambdaUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public final class LambdaUtils {
5555
private static final char[] HEX = "0123456789abcdef".toCharArray();
5656
public static final String LAMBDA_SPLIT_PATTERN;
5757
public static final String LAMBDA_CLASS_NAME_SUBSTRING;
58+
public static final String SERIALIZATION_TEST_LAMBDA_CLASS_SUBSTRING = "$$Lambda";
59+
public static final String SERIALIZATION_TEST_LAMBDA_CLASS_SPLIT_PATTERN = "\\$\\$Lambda";
5860

5961
static {
6062
if (Runtime.version().feature() < 21) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ private static void parsePatternAndRegister(String pattern) {
322322
// Pattern is a classname (possibly empty) with a trailing wildcard
323323
final String className = p.substring(poffset, nameLen - 1);
324324
if (!negate) {
325-
if (className.endsWith("$$Lambda")) {
325+
if (className.endsWith(LambdaUtils.SERIALIZATION_TEST_LAMBDA_CLASS_SUBSTRING)) {
326326
try {
327-
String lambdaHolderName = className.split(LambdaUtils.LAMBDA_SPLIT_PATTERN)[0];
327+
String lambdaHolderName = className.split(LambdaUtils.SERIALIZATION_TEST_LAMBDA_CLASS_SPLIT_PATTERN)[0];
328328
RuntimeSerialization.registerLambdaCapturingClass(Class.forName(lambdaHolderName, false, Thread.currentThread().getContextClassLoader()));
329329
} catch (ClassNotFoundException e) {
330330
// no class, no registration

0 commit comments

Comments
 (0)