backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

add a variable slot for THIS parameter to lambda methods to increment the variable index.

Browse Source
This commit is contained in:
Volker Berlin 2021-01-24 18:41:01 +01:00
parent c1869baee5
commit 740b7a8c19
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/de/inetsoftware/classparser/MethodInfo.java
View File

@ -119,6 +119,15 @@ public class MethodInfo implements Member {
return (accessFlags & 0x1000) > 0; return (accessFlags & 0x1000) > 0;
} }
/**
* If the method is a synthetic lambda method
*
* @return true, if lambda method
*/
public boolean isLambda() {
return (accessFlags & 0x1000) > 0 && name.startsWith( "lambda$" );
}
/** /**
* @return the name * @return the name
*/ */

15
src/de/inetsoftware/jwebassembly/module/LocaleVariableManager.java
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2018 - 2020 Volker Berlin (i-net software) Copyright 2018 - 2021 Volker Berlin (i-net software)
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -87,6 +87,13 @@ class LocaleVariableManager {
void reset( LocalVariableTable variableTable, MethodInfo method, Iterator<AnyType> signature ) { void reset( LocalVariableTable variableTable, MethodInfo method, Iterator<AnyType> signature ) {
size = 0; size = 0;
if( method != null && method.isLambda() ) {
AnyType type = types.options.useGC() ? types.valueOf( "java/lang/Object" ) : ValueType.externref;
resetAddVar( type, -1 );
variables[0].name = "this";
}
int baseSize = size;
int maxLocals; int maxLocals;
if( variableTable == null ) { if( variableTable == null ) {
maxLocals = 0; maxLocals = 0;
@ -160,7 +167,7 @@ class LocaleVariableManager {
} }
// add missing slots from signature // add missing slots from signature
if( (maxLocals > 0 || variableTable == null) && size == 0 && (method != null || signature != null )) { if( (maxLocals > 0 || variableTable == null) && size == baseSize && (method != null || signature != null )) {
Iterator<AnyType> parser = signature == null ? new ValueTypeParser( method.getType(), types ) : signature; Iterator<AnyType> parser = signature == null ? new ValueTypeParser( method.getType(), types ) : signature;
if( method != null && !method.isStatic() ) { if( method != null && !method.isStatic() ) {
resetAddVar( ValueType.externref, size ); resetAddVar( ValueType.externref, size );
@ -170,12 +177,12 @@ class LocaleVariableManager {
if( type == null ) { if( type == null ) {
break; break;
} }
resetAddVar( type, size ); resetAddVar( type, size - baseSize );
} }
} }
// add all missing slots that we can add self temporary variables // add all missing slots that we can add self temporary variables
NEXT: for( int i = 0; i < maxLocals; i++ ) { NEXT: for( int i = 0; i < maxLocals + baseSize; i++ ) {
for( int j = 0; j < size; j++ ) { for( int j = 0; j < size; j++ ) {
Variable var = variables[j]; Variable var = variables[j];
if( var.idx == i ) { if( var.idx == i ) {

2
src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java
View File

@ -224,7 +224,7 @@ public class ModuleGenerator {
createInstructions( functions.replace( next, method ) ); createInstructions( functions.replace( next, method ) );
boolean needThisParameter = !method.isStatic() // if not static there is a not declared THIS parameter boolean needThisParameter = !method.isStatic() // if not static there is a not declared THIS parameter
|| "<init>".equals( method.getName() ) // constructor method need also the THIS parameter also if marked as static || "<init>".equals( method.getName() ) // constructor method need also the THIS parameter also if marked as static
|| (method.isSynthetic() && method.getName().startsWith( "lambda$" )); // lambda functions are static but will call with a THIS parameter which need be removed from stack || (method.isLambda() ); // lambda functions are static but will call with a THIS parameter which need be removed from stack
functions.markAsScanned( next, needThisParameter ); functions.markAsScanned( next, needThisParameter );
if( needThisParameter ) { if( needThisParameter ) {
types.valueOf( next.className ); // for the case that the type unknown yet types.valueOf( next.className ); // for the case that the type unknown yet