infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-14 12:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8169331: [JVMCI] incomplete API to MethodParameters attribute

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Doug Simon 2016-11-07 17:02:46 +01:00
parent db9932fb37
commit 1bab9425ed
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotResolvedJavaMethodImpl.java
View File

@ -472,7 +472,8 @@ final class HotSpotResolvedJavaMethodImpl extends HotSpotMethod implements HotSp
Parameter[] res = new Parameter[javaParameters.length];
for (int i = 0; i < res.length; i++) {
java.lang.reflect.Parameter src = javaParameters[i];
res[i] = new Parameter(src.getName(), src.getModifiers(), this, i);
String paramName = src.isNamePresent() ? src.getName() : null;
res[i] = new Parameter(paramName, src.getModifiers(), this, i);
}
return res;
}

33
hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.meta/src/jdk/vm/ci/meta/ResolvedJavaMethod.java
View File

@ -177,7 +177,7 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
/**
* A {@code Parameter} provides information about method parameters.
*/
public static class Parameter implements AnnotatedElement {
class Parameter implements AnnotatedElement {
private final String name;
private final ResolvedJavaMethod method;
private final int modifiers;
@ -186,7 +186,9 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
/**
* Constructor for {@code Parameter}.
*
* @param name the name of the parameter
* @param name the name of the parameter or {@code null} if there is no
* {@literal MethodParameters} class file attribute providing a non-empty name
* for the parameter
* @param modifiers the modifier flags for the parameter
* @param method the method which defines this parameter
* @param index the index of the parameter
@ -195,6 +197,7 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
int modifiers,
ResolvedJavaMethod method,
int index) {
assert name == null || !name.isEmpty();
this.name = name;
this.modifiers = modifiers;
this.method = method;
@ -202,10 +205,20 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
}
/**
* Gets the name of the parameter.
* Gets the name of the parameter. If the parameter's name is {@linkplain #isNamePresent()
* present}, then this method returns the name provided by the class file. Otherwise, this
* method synthesizes a name of the form argN, where N is the index of the parameter in the
* descriptor of the method which declares the parameter.
*
* @return the name of the parameter, either provided by the class file or synthesized if
* the class file does not provide a name
*/
public String getName() {
return name;
if (name == null) {
return "arg" + index;
} else {
return name;
}
}
/**
@ -216,7 +229,7 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
}
/**
* Get the modifier flags for the parameter
* Get the modifier flags for the parameter.
*/
public int getModifiers() {
return modifiers;
@ -243,6 +256,16 @@ public interface ResolvedJavaMethod extends JavaMethod, InvokeTarget, ModifiersP
return method.getSignature().getParameterType(index, method.getDeclaringClass());
}
/**
* Determines if the parameter has a name according to a {@literal MethodParameters} class
* file attribute.
*
* @return true if and only if the parameter has a name according to the class file.
*/
public boolean isNamePresent() {
return name != null;
}
/**
* Determines if the parameter represents a variable argument list.
*/

2
hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java
View File

@ -278,7 +278,7 @@ public class TestResolvedJavaMethod extends MethodUniverse {
java.lang.reflect.Parameter exp = expected[i];
Parameter act = actual[i];
assertEquals(exp.getName(), act.getName());
assertEquals(exp.getModifiers(), act.getModifiers());
assertEquals(exp.isNamePresent(), act.isNamePresent());
assertEquals(exp.getModifiers(), act.getModifiers());
assertArrayEquals(exp.getAnnotations(), act.getAnnotations());
assertEquals(exp.getType().getName(), act.getType().toClassName());