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() {
613613 String src = """
614614// based on the top-down version from https://en.wikipedia.org/wiki/Merge_sort
615615// 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)
617617{
618618 copy_array(a, 0, n, b)
619619 split_merge(a, 0, n, b)
Original file line number Diff line number Diff line change @@ -250,7 +250,7 @@ public void testMergeSort() {
250250 String src = """
251251// based on the top-down version from https://en.wikipedia.org/wiki/Merge_sort
252252// 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)
254254{
255255 copy_array(a, 0, n, b)
256256 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) {
941941 }
942942
943943 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 ;
945949 // Need default memory, since it can be lazy, need to force
946950 // a non-lazy Phi
947951 _fun .addReturn (ctrl (), _scope .mem ().merge (), expr );
You can’t perform that action at this time.
0 commit comments