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/shell-interface.h | |
| 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/shell-interface.h')
| -rw-r--r-- | src/shell-interface.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/shell-interface.h b/src/shell-interface.h index 63cbd9807..52533f37c 100644 --- a/src/shell-interface.h +++ b/src/shell-interface.h @@ -149,7 +149,7 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface { Literal callTable(Index index, LiteralList& arguments, - Type result, + Type results, ModuleInstance& instance) override { if (index >= table.size()) { trap("callTable overflow"); @@ -158,15 +158,16 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface { if (!func) { trap("uninitialized table element"); } - if (func->params.size() != arguments.size()) { + const std::vector<Type>& params = func->sig.params.expand(); + if (params.size() != arguments.size()) { trap("callIndirect: bad # of arguments"); } - for (size_t i = 0; i < func->params.size(); i++) { - if (func->params[i] != arguments[i].type) { + for (size_t i = 0; i < params.size(); i++) { + if (params[i] != arguments[i].type) { trap("callIndirect: bad argument type"); } } - if (func->result != result) { + if (func->sig.results != results) { trap("callIndirect: bad result type"); } if (func->imported()) { |