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

improve exception handling

Browse Source
This commit is contained in:
Volker Berlin 2019-03-09 13:22:40 +01:00
parent 785a0db74c
commit 86defc3792
3 changed files with 67 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/de/inetsoftware/jwebassembly/module/BranchManger.java
View File

@ -332,7 +332,7 @@ class BranchManger {
*/ */
private int calculateBreakDeep( BranchNode parent, int endPos ) { private int calculateBreakDeep( BranchNode parent, int endPos ) {
int deep = -1; int deep = -1;
while( parent != null && parent.endPos == endPos ) { while( parent != null && parent.endPos == endPos && parent.data == null ) {
deep++; deep++;
parent = parent.parent; parent = parent.parent;
} }
@ -630,12 +630,13 @@ class BranchManger {
private void calculateTry( BranchNode parent, TryCatchParsedBlock tryBlock, List<ParsedBlock> parsedOperations ) { private void calculateTry( BranchNode parent, TryCatchParsedBlock tryBlock, List<ParsedBlock> parsedOperations ) {
TryCatchFinally tryCatch = tryBlock.tryCatch; TryCatchFinally tryCatch = tryBlock.tryCatch;
int gotoPos = tryCatch.getEnd(); // alternativ we can use tryCatch.getHandler()-3 int gotoPos = tryCatch.getHandler()-3; //tryCatch.getEnd() points some time bevore and some time after the goto
int endPos = parent.endPos; int endPos = parent.endPos;
for( int i = 0; i < parsedOperations.size(); i++ ) { int idx;
ParsedBlock parsedBlock = parsedOperations.get( i ); for( idx = 0; idx < parsedOperations.size(); idx++ ) {
ParsedBlock parsedBlock = parsedOperations.get( idx );
if( parsedBlock.startPosition == gotoPos && parsedBlock.op == JavaBlockOperator.GOTO && parsedBlock.startPosition < parsedBlock.endPosition ) { if( parsedBlock.startPosition == gotoPos && parsedBlock.op == JavaBlockOperator.GOTO && parsedBlock.startPosition < parsedBlock.endPosition ) {
parsedOperations.remove( i ); parsedOperations.remove( idx );
endPos = parsedBlock.endPosition; endPos = parsedBlock.endPosition;
break; break;
} }
@ -653,12 +654,19 @@ class BranchManger {
parent.add( node ); parent.add( node );
parent = node; parent = node;
parent.add( new BranchNode( startPos, catchPos, WasmBlockOperator.TRY, null ) ); BranchNode tryNode = new BranchNode( startPos, catchPos, WasmBlockOperator.TRY, null );
parent.add( tryNode );
calculate( tryNode, parsedOperations.subList( 0, idx ) );
BranchNode catchNode = new BranchNode( catchPos, catchPos, WasmBlockOperator.CATCH, WasmBlockOperator.END ); BranchNode catchNode = new BranchNode( catchPos, catchPos, WasmBlockOperator.CATCH, WasmBlockOperator.END );
parent.add( catchNode ); parent.add( catchNode );
catchNode.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.BR_ON_EXN, null, 1 ) ); if( tryCatch.isFinally() ) {
catchNode.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.RETHROW, null ) ); catchNode.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.DROP, null ) );
} else {
catchNode.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.BR_ON_EXN, null, 1 ) );
catchNode.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.RETHROW, null ) );
}
parent.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.BR, null, 1 ) ); parent.add( new BranchNode( catchPos, catchPos, WasmBlockOperator.BR, null, 1 ) );
} }

2
test/de/inetsoftware/jwebassembly/WasmRule.java
View File

@ -180,7 +180,7 @@ public class WasmRule extends TemporaryFolder {
File wat2WasmFile = new File( getRoot(), "wat2Wasm.wasm" ); File wat2WasmFile = new File( getRoot(), "wat2Wasm.wasm" );
// the wat2wasm tool // the wat2wasm tool
ProcessBuilder processBuilder = ProcessBuilder processBuilder =
new ProcessBuilder( cmd, watFile.toString(), "-o", wat2WasmFile.toString(), "--enable-saturating-float-to-int", "--enable-sign-extension", "--enable-multi-value", "--enable-exceptions" ); new ProcessBuilder( cmd, watFile.toString(), "-o", wat2WasmFile.toString(), "--enable-saturating-float-to-int", "--enable-sign-extension", "--enable-multi-value", "--enable-exceptions", "--enable-reference-types" );
execute( processBuilder ); execute( processBuilder );
// create the node script // create the node script

54
test/de/inetsoftware/jwebassembly/runtime/Exceptions.java
View File

@ -42,6 +42,10 @@ public class Exceptions extends AbstractBaseTest {
for( ScriptEngine[] val : ScriptEngine.testParams() ) { for( ScriptEngine[] val : ScriptEngine.testParams() ) {
ScriptEngine script = val[0]; ScriptEngine script = val[0];
addParam( list, script, "simple" ); addParam( list, script, "simple" );
addParam( list, script, "direct" );
addParam( list, script, "rethrow" );
addParam( list, script, "tryFinally" );
addParam( list, script, "complex" );
} }
return list; return list;
} }
@ -56,10 +60,6 @@ public class Exceptions extends AbstractBaseTest {
@Export @Export
static int simple() { static int simple() {
return 1;
}
static int simple2() {
int r; int r;
try { try {
r = 5 / 0; r = 5 / 0;
@ -77,5 +77,51 @@ public class Exceptions extends AbstractBaseTest {
return 2; return 2;
} }
} }
@Export
static int rethrow() {
try {
return 5 / 0;
} catch(Exception ex ) {
throw ex;
}
}
@Export
static int tryFinally() {
int v = 1;
try {
v++;
v = 5 / 0;
} finally {
v++;
return v;
}
}
@Export
static int complex() {
int v = 1;
try {
if( v == 1 ) {
v++;
v = divNull();
} else {
v += 2;
}
} finally {
v++;
return v;
}
}
private static int divNull() {
return 5 / 0;
}
// @Export
// static int npe() {
// Object obj = new NullPointerException();
// return 3;
// }
} }
} }