1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8178480: Wrong exception being thrown on an invalid MethodType

Browse Source 
Reviewed-by: psandoz
This commit is contained in:
Claes Redestad 2017-04-11 22:32:49 +02:00
parent 864cf0d5ca
commit 3b47209a32
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
View File

@ -673,9 +673,7 @@ class InvokerBytecodeGenerator {
/** /**
* Generate customized bytecode for a given LambdaForm. * Generate customized bytecode for a given LambdaForm.
*/ */
static MemberName generateCustomizedCode(LambdaForm form) { static MemberName generateCustomizedCode(LambdaForm form, MethodType invokerType) {
final MethodType invokerType = form.methodType();
MemberName pregenerated = lookupPregenerated(form, invokerType); MemberName pregenerated = lookupPregenerated(form, invokerType);
if (pregenerated != null) return pregenerated; // pre-generated bytecode if (pregenerated != null) return pregenerated; // pre-generated bytecode

9
jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java
View File

@ -847,9 +847,14 @@ class LambdaForm {
if (vmentry != null && isCompiled) { if (vmentry != null && isCompiled) {
return; // already compiled somehow return; // already compiled somehow
} }
assert(vmentry == null || vmentry.getMethodType().basicType().equals(methodType()));
// Obtain the invoker MethodType outside of the following try block.
// This ensures that an IllegalArgumentException is directly thrown if the
// type would have 256 or more parameters
MethodType invokerType = methodType();
assert(vmentry == null || vmentry.getMethodType().basicType().equals(invokerType));
try { try {
vmentry = InvokerBytecodeGenerator.generateCustomizedCode(this); vmentry = InvokerBytecodeGenerator.generateCustomizedCode(this, invokerType);
if (TRACE_INTERPRETER) if (TRACE_INTERPRETER)
traceInterpreter("compileToBytecode", this); traceInterpreter("compileToBytecode", this);
isCompiled = true; isCompiled = true;