diff options
| author | Thomas Lively <7121787+tlively@users.noreply.github.com> | 2019-12-11 17:12:37 -0800 |
|---|---|---|
| committer | Alon Zakai <azakai@google.com> | 2019-12-11 17:12:37 -0800 |
| commit | 759c485a9f35bd859d43b86b02e1397a669fa469 (patch) | |
| tree | a5c7475002b406e35c6d1e5c2d843000947ef192 /src/passes/ReReloop.cpp | |
| parent | acd786dbd1e59f9d105c4ec8603c2ff46f233649 (diff) | |
| download | binaryen-759c485a9f35bd859d43b86b02e1397a669fa469.tar.gz binaryen-759c485a9f35bd859d43b86b02e1397a669fa469.tar.bz2 binaryen-759c485a9f35bd859d43b86b02e1397a669fa469.zip | |
Remove FunctionType (#2510)
Function signatures were previously redundantly stored on Function
objects as well as on FunctionType objects. These two signature
representations had to always be kept in sync, which was error-prone
and needlessly complex. This PR takes advantage of the new ability of
Type to represent multiple value types by consolidating function
signatures as a pair of Types (params and results) stored on the
Function object.
Since there are no longer module-global named function types,
significant changes had to be made to the printing and emitting of
function types, as well as their parsing and manipulation in various
passes.
The C and JS APIs and their tests also had to be updated to remove
named function types.
Diffstat (limited to 'src/passes/ReReloop.cpp')
| -rw-r--r-- | src/passes/ReReloop.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/passes/ReReloop.cpp b/src/passes/ReReloop.cpp index 5d4190d18..53a232dc1 100644 --- a/src/passes/ReReloop.cpp +++ b/src/passes/ReReloop.cpp @@ -321,7 +321,7 @@ struct ReReloop final : public Pass { for (auto* cfgBlock : relooper->Blocks) { auto* block = cfgBlock->Code->cast<Block>(); if (cfgBlock->BranchesOut.empty() && block->type != unreachable) { - block->list.push_back(function->result == none + block->list.push_back(function->sig.results == Type::none ? (Expression*)builder->makeReturn() : (Expression*)builder->makeUnreachable()); block->finalize(); @@ -354,7 +354,8 @@ struct ReReloop final : public Pass { // because of the relooper's boilerplate switch-handling // code, for example, which could be optimized out later // but isn't yet), then make sure it has a proper type - if (function->result != none && function->body->type == none) { + if (function->sig.results != Type::none && + function->body->type == Type::none) { function->body = builder.makeSequence(function->body, builder.makeUnreachable()); } |