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

8310849: Pattern matching for instanceof and arrayType cleanup in j.l.invoke and j.l.reflect

Browse source 
Reviewed-by: mchung, darcy
This commit is contained in:
Chen Liang 2023-06-27 16:10:50 +00:00 • committed by Mandy Chung
parent 7ce967a10c
commit 2bd4136bdb
34 changed files with 211 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/share/classes/sun/invoke/util/BytecodeName.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -354,8 +354,8 @@ public class BytecodeName {
Object[] components0 = components;
for (int i = 0; i < components.length; i++) {
Object c = components[i];
if (c instanceof String) {
String mc = toBytecodeName((String) c);
if (c instanceof String s) {
String mc = toBytecodeName(s);
if (i == 0 && components.length == 1)
return mc; // usual case
if ((Object)mc != c) {
@ -376,8 +376,8 @@ public class BytecodeName {
}
int slen = 0;
for (Object c : components) {
if (c instanceof String)
slen += String.valueOf(c).length();
if (c instanceof String s)
slen += s.length();
else
slen += 1;
}
@ -408,9 +408,8 @@ public class BytecodeName {
public static String toDisplayName(String s) {
Object[] components = parseBytecodeName(s);
for (int i = 0; i < components.length; i++) {
if (!(components[i] instanceof String))
if (!(components[i] instanceof String sn))
continue;
String sn = (String) components[i];
// note that the name is already demangled!
//sn = toSourceName(sn);
if (!isJavaIdent(sn) || sn.indexOf('$') >=0 ) {