diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/passes/J2CLOpts.cpp | 1 | ||||
| -rw-r--r-- | src/wasm/wasm-ir-builder.cpp | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/passes/J2CLOpts.cpp b/src/passes/J2CLOpts.cpp index cc73e873e..d0df446e1 100644 --- a/src/passes/J2CLOpts.cpp +++ b/src/passes/J2CLOpts.cpp @@ -43,6 +43,7 @@ Expression* getTrivialFunctionBody(Function* func) { // Only consider trivial the following instructions which can be safely // inlined and note that their size is at most 2. if (body->is<Nop>() || body->is<GlobalGet>() || body->is<Const>() || + (body->is<Block>() && body->cast<Block>()->list.empty()) || // Call with no arguments. (body->is<Call>() && body->dynCast<Call>()->operands.size() == 0) || // Simple global.set with a constant. diff --git a/src/wasm/wasm-ir-builder.cpp b/src/wasm/wasm-ir-builder.cpp index 4cb9514f5..5e5decca4 100644 --- a/src/wasm/wasm-ir-builder.cpp +++ b/src/wasm/wasm-ir-builder.cpp @@ -157,7 +157,7 @@ void IRBuilder::push(Expression* expr) { Result<Expression*> IRBuilder::build() { if (scopeStack.empty()) { - return builder.makeNop(); + return builder.makeBlock(); } if (scopeStack.size() > 1 || !scopeStack.back().isNone()) { return Err{"unfinished block context"}; @@ -792,12 +792,13 @@ Result<Expression*> IRBuilder::finishScope(Block* block) { Expression* ret = nullptr; if (scope.exprStack.size() == 0) { // No expressions for this scope, but we need something. If we were given a - // block, we can empty it out and return it, but otherwise we need a nop. + // block, we can empty it out and return it, but otherwise create a new + // empty block. if (block) { block->list.clear(); ret = block; } else { - ret = builder.makeNop(); + ret = builder.makeBlock(); } } else if (scope.exprStack.size() == 1) { // We can put our single expression directly into the surrounding scope. |