stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8304161: Add TypeKind.from to derive from TypeDescriptor.OfField

Browse Source 
Reviewed-by: jvernee
This commit is contained in:
Chen Liang 2023-03-16 12:31:01 +00:00 committed by Jorn Vernee
parent d4eb395335
commit 7dbab81d3c
6 changed files with 17 additions and 7 deletions
src/java.base/share/classes/jdk/internal/classfile
TypeKind.java
components
CodeLocalsShifter.javaCodeStackTracker.java
snippet-files
PackageSnippets.java
snippet-files
PackageSnippets.java
test/jdk/jdk/classfile
AdvancedTransformationsTest.java

12
src/java.base/share/classes/jdk/internal/classfile/TypeKind.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 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
@ -25,6 +25,8 @@
package jdk.internal.classfile;
import java.lang.invoke.TypeDescriptor;
/**
* Describes the types that can be part of a field or method descriptor.
*/
@ -132,4 +134,12 @@ public enum TypeKind {
default -> throw new IllegalArgumentException("Bad type: " + s);
};
}
/**
* {@return the type kind associated with the specified field descriptor}
* @param descriptor the field descriptor
*/
public static TypeKind from(TypeDescriptor.OfField<?> descriptor) {
return fromDescriptor(descriptor.descriptorString());
}
}

2
src/java.base/share/classes/jdk/internal/classfile/components/CodeLocalsShifter.java

@ -57,7 +57,7 @@ public sealed interface CodeLocalsShifter extends CodeTransform {
static CodeLocalsShifter of(AccessFlags methodFlags, MethodTypeDesc methodDescriptor) {
int fixed = methodFlags.has(AccessFlag.STATIC) ? 0 : 1;
for (var param : methodDescriptor.parameterList())
fixed += TypeKind.fromDescriptor(param.descriptorString()).slotSize();
fixed += TypeKind.from(param).slotSize();
return new CodeLocalsShifterImpl(fixed);
}

4
src/java.base/share/classes/jdk/internal/classfile/components/CodeStackTracker.java

@ -235,13 +235,13 @@ public sealed interface CodeStackTracker extends CodeTransform {
case InvokeDynamicInstruction i -> {
var type = i.typeSymbol();
pop(type.parameterCount());
push(TypeKind.fromDescriptor(type.returnType().descriptorString()));
push(TypeKind.from(type.returnType()));
}
case InvokeInstruction i -> {
var type = i.typeSymbol();
pop(type.parameterCount());
if (i.opcode() != Opcode.INVOKESTATIC) pop(1);
push(TypeKind.fromDescriptor(type.returnType().descriptorString()));
push(TypeKind.from(type.returnType()));
}
case LoadInstruction i ->
push(i.typeKind());

2
src/java.base/share/classes/jdk/internal/classfile/components/snippet-files/PackageSnippets.java

@ -173,7 +173,7 @@ class PackageSnippets {
if (!mm.flags().has(AccessFlag.STATIC))
storeStack.push(StoreInstruction.of(TypeKind.ReferenceType, slot++));
for (var pt : mm.methodTypeSymbol().parameterList()) {
var tk = TypeKind.fromDescriptor(pt.descriptorString());
var tk = TypeKind.from(pt);
storeStack.push(StoreInstruction.of(tk, slot));
slot += tk.slotSize();
}

2
src/java.base/share/classes/jdk/internal/classfile/snippet-files/PackageSnippets.java

@ -267,7 +267,7 @@ class PackageSnippets {
if (!mm.flags().has(AccessFlag.STATIC))
storeStack.add(StoreInstruction.of(TypeKind.ReferenceType, slot++));
for (var pt : mm.methodTypeSymbol().parameterList()) {
var tk = TypeKind.fromDescriptor(pt.descriptorString());
var tk = TypeKind.from(pt);
storeStack.addFirst(StoreInstruction.of(tk, slot));
slot += tk.slotSize();
}

2
test/jdk/jdk/classfile/AdvancedTransformationsTest.java

@ -319,7 +319,7 @@ class AdvancedTransformationsTest {
if (!mm.flags().has(AccessFlag.STATIC))
storeStack.push(StoreInstruction.of(TypeKind.ReferenceType, slot++));
for (var pt : mm.methodTypeSymbol().parameterList()) {
var tk = TypeKind.fromDescriptor(pt.descriptorString());
var tk = TypeKind.from(pt);
storeStack.push(StoreInstruction.of(tk, slot));
slot += tk.slotSize();
}