diff options
| -rw-r--r-- | src/passes/SimplifyLocals.cpp | 5 | ||||
| -rw-r--r-- | test/passes/simplify-locals.txt | 29 | ||||
| -rw-r--r-- | test/passes/simplify-locals.wast | 26 |
3 files changed, 57 insertions, 3 deletions
diff --git a/src/passes/SimplifyLocals.cpp b/src/passes/SimplifyLocals.cpp index e032acc77..acc6860be 100644 --- a/src/passes/SimplifyLocals.cpp +++ b/src/passes/SimplifyLocals.cpp @@ -351,9 +351,8 @@ struct SimplifyLocals : public WalkerPass<LinearExecutionWalker<SimplifyLocals, // optimize set_locals from both sides of an if into a return value void optimizeIfReturn(If* iff, Expression** currp, Sinkables& ifTrue) { assert(iff->ifFalse); - // if this if already has a result that is used, we can't do anything - assert(expressionStack.back() == iff); - if (ExpressionAnalyzer::isResultUsed(expressionStack, getFunction())) return; + // if this if already has a result, we can't do anything + if (isConcreteWasmType(iff->type)) return; // We now have the sinkables from both sides of the if. Sinkables& ifFalse = sinkables; Index sharedIndex = -1; diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt index f2aa8d0d9..f12054887 100644 --- a/test/passes/simplify-locals.txt +++ b/test/passes/simplify-locals.txt @@ -9,6 +9,7 @@ (type $6 (func (param i32 i32 i32 i32 i32 i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $8 (func (param i32 i32))) + (type $9 (func (param i32 i32 i32) (result i32))) (import "env" "waka" (func $waka)) (import "env" "waka_int" (func $waka_int (result i32))) (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32))) @@ -735,4 +736,32 @@ ) (get_local $a) ) + (func $drop-if-value (type $9) (param $x i32) (param $y i32) (param $z i32) (result i32) + (local $temp i32) + (drop + (if + (get_local $x) + (block $block53 i32 + (nop) + (set_local $temp + (get_local $y) + ) + (get_local $z) + ) + (block $block54 i32 + (nop) + (set_local $temp + (get_local $y) + ) + (get_local $z) + ) + ) + ) + (drop + (get_local $temp) + ) + (return + (i32.const 0) + ) + ) ) diff --git a/test/passes/simplify-locals.wast b/test/passes/simplify-locals.wast index 4fa345770..a998daf5f 100644 --- a/test/passes/simplify-locals.wast +++ b/test/passes/simplify-locals.wast @@ -775,4 +775,30 @@ ) (get_local $a) ) + (func $drop-if-value (param $x i32) (param $y i32) (param $z i32) (result i32) + (local $temp i32) + (drop + (if + (get_local $x) + (block $block53 i32 + (nop) + (set_local $temp + (get_local $y) + ) + (get_local $z) + ) + (block $block54 i32 + (nop) + (set_local $temp + (get_local $y) + ) + (get_local $z) + ) + ) + ) + (drop (get_local $temp)) + (return + (i32.const 0) + ) + ) ) |