File tree Expand file tree Collapse file tree 3 files changed +7
-3
lines changed
optvm/src/test/java/com/compilerprogramming/ezlang/interpreter
registervm/src/test/java/com/compilerprogramming/ezlang/interpreter
seaofnodes/src/main/java/com/compilerprogramming/ezlang/compiler Expand file tree Collapse file tree 3 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -613,7 +613,7 @@ public void testMergeSort() {
613
613
String src = """
614
614
// based on the top-down version from https://en.wikipedia.org/wiki/Merge_sort
615
615
// via https://github.com/SeaOfNodes/Simple
616
- func merge_sort(a: [Int], b: [int ], n: Int)
616
+ func merge_sort(a: [Int], b: [Int ], n: Int)
617
617
{
618
618
copy_array(a, 0, n, b)
619
619
split_merge(a, 0, n, b)
Original file line number Diff line number Diff line change @@ -250,7 +250,7 @@ public void testMergeSort() {
250
250
String src = """
251
251
// based on the top-down version from https://en.wikipedia.org/wiki/Merge_sort
252
252
// via https://github.com/SeaOfNodes/Simple
253
- func merge_sort(a: [Int], b: [int ], n: Int)
253
+ func merge_sort(a: [Int], b: [Int ], n: Int)
254
254
{
255
255
copy_array(a, 0, n, b)
256
256
split_merge(a, 0, n, b)
Original file line number Diff line number Diff line change @@ -941,7 +941,11 @@ private Node compileLet(AST.VarStmt letStmt) {
941
941
}
942
942
943
943
private Node compileReturn (AST .ReturnStmt returnStmt ) {
944
- var expr = compileExpr (returnStmt .expr );
944
+ Node expr ;
945
+ if (returnStmt .expr != null )
946
+ expr = compileExpr (returnStmt .expr );
947
+ else
948
+ expr = ZERO ;
945
949
// Need default memory, since it can be lazy, need to force
946
950
// a non-lazy Phi
947
951
_fun .addReturn (ctrl (), _scope .mem ().merge (), expr );
You can’t perform that action at this time.
0 commit comments