From 759c485a9f35bd859d43b86b02e1397a669fa469 Mon Sep 17 00:00:00 2001 From: Thomas Lively <7121787+tlively@users.noreply.github.com> Date: Wed, 11 Dec 2019 17:12:37 -0800 Subject: 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. --- test/example/c-api-hello-world.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/example/c-api-hello-world.c') diff --git a/test/example/c-api-hello-world.c b/test/example/c-api-hello-world.c index 3b412f67f..550176dc6 100644 --- a/test/example/c-api-hello-world.c +++ b/test/example/c-api-hello-world.c @@ -1,4 +1,3 @@ - #include // "hello world" type example: create a function that adds two i32s and returns @@ -8,9 +7,9 @@ int main() { BinaryenModuleRef module = BinaryenModuleCreate(); // Create a function type for i32 (i32, i32) - BinaryenType params[2] = {BinaryenTypeInt32(), BinaryenTypeInt32()}; - BinaryenFunctionTypeRef iii = - BinaryenAddFunctionType(module, "iii", BinaryenTypeInt32(), params, 2); + BinaryenType ii[2] = {BinaryenTypeInt32(), BinaryenTypeInt32()}; + BinaryenType params = BinaryenTypeCreate(ii, 2); + BinaryenType results = BinaryenTypeInt32(); // Get the 0 and 1 arguments, and add them BinaryenExpressionRef x = BinaryenLocalGet(module, 0, BinaryenTypeInt32()), @@ -22,7 +21,7 @@ int main() { // Note: no basic blocks here, we are an AST. The function body is just an // expression node. BinaryenFunctionRef adder = - BinaryenAddFunction(module, "adder", iii, NULL, 0, add); + BinaryenAddFunction(module, "adder", params, results, NULL, 0, add); // Print it out BinaryenModulePrint(module); -- cgit v1.2.3