diff options
author | Alon Zakai <alonzakai@gmail.com> | 2015-12-06 18:00:38 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2015-12-06 18:00:38 -0800 |
commit | 43ddf341c47350db98618c49a5d0acb0af6960ab (patch) | |
tree | 58e02c3d105945e9cde41236c7646c6040352006 /src | |
parent | 79d04e7fd2fc6a09f2318e227b1d68bfd3bc0325 (diff) | |
download | binaryen-43ddf341c47350db98618c49a5d0acb0af6960ab.tar.gz binaryen-43ddf341c47350db98618c49a5d0acb0af6960ab.tar.bz2 binaryen-43ddf341c47350db98618c49a5d0acb0af6960ab.zip |
coerce returns in wasm2asm
Diffstat (limited to 'src')
-rw-r--r-- | src/wasm2asm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wasm2asm.h b/src/wasm2asm.h index 6a27337a8..8f8025dfa 100644 --- a/src/wasm2asm.h +++ b/src/wasm2asm.h @@ -236,13 +236,13 @@ Ref Wasm2AsmBuilder::processFunction(Function* func) { flattenAppend(ret, ValueBuilder::makeStatement(processFunctionBody(func->body, result))); if (func->result != none) { // do the actual return - ret[3]->push_back(ValueBuilder::makeStatement(ValueBuilder::makeReturn(ValueBuilder::makeName(result)))); + ret[3]->push_back(ValueBuilder::makeStatement(ValueBuilder::makeReturn(makeAsmCoercion(ValueBuilder::makeName(result), wasmToAsmType(func->result))))); freeTemp(func->result, result); } } else { // whole thing is an expression, just do a return if (func->result != none) { - ret[3]->push_back(ValueBuilder::makeStatement(ValueBuilder::makeReturn(processFunctionBody(func->body, EXPRESSION_RESULT)))); + ret[3]->push_back(ValueBuilder::makeStatement(ValueBuilder::makeReturn(makeAsmCoercion(processFunctionBody(func->body, EXPRESSION_RESULT), wasmToAsmType(func->result))))); } else { flattenAppend(ret, processFunctionBody(func->body, NO_RESULT)); } |