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 /test/debugInfo.fromasm.read-written | |
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 'test/debugInfo.fromasm.read-written')
-rw-r--r-- | test/debugInfo.fromasm.read-written | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/debugInfo.fromasm.read-written b/test/debugInfo.fromasm.read-written index 3459a2cf8..b66e45ac4 100644 --- a/test/debugInfo.fromasm.read-written +++ b/test/debugInfo.fromasm.read-written @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32) (result i32))) - (type $1 (func (param i32 i32) (result i32))) - (type $2 (func)) + (type $i32_=>_i32 (func (param i32) (result i32))) + (type $i32_i32_=>_i32 (func (param i32 i32) (result i32))) + (type $none_=>_none (func)) (import "env" "memory" (memory $1 256 256)) (data (global.get $gimport$0) "debugInfo.asm.js") (import "env" "__memory_base" (global $gimport$0 i32)) @@ -12,14 +12,14 @@ (export "switch_reach" (func $switch_reach)) (export "nofile" (func $nofile)) (export "inlineInto" (func $inlineInto)) - (func $add (; 0 ;) (type $1) (param $0 i32) (param $1 i32) (result i32) + (func $add (; 0 ;) (param $0 i32) (param $1 i32) (result i32) ;;@ tests/other_file.cpp:314159:0 (i32.add (local.get $1) (local.get $1) ) ) - (func $ret (; 1 ;) (type $0) (param $0 i32) (result i32) + (func $ret (; 1 ;) (param $0 i32) (result i32) ;;@ return.cpp:50:0 (local.set $0 (i32.shl @@ -33,7 +33,7 @@ (i32.const 1) ) ) - (func $opts (; 2 ;) (type $1) (param $0 i32) (param $1 i32) (result i32) + (func $opts (; 2 ;) (param $0 i32) (param $1 i32) (result i32) (local $2 i32) ;;@ even-opted.cpp:3:0 (i32.add @@ -64,7 +64,7 @@ (local.get $0) ) ) - (func $fib (; 3 ;) (type $0) (param $0 i32) (result i32) + (func $fib (; 3 ;) (param $0 i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -123,7 +123,7 @@ ;;@ fib.c:8:0 (local.get $4) ) - (func $switch_reach (; 4 ;) (type $0) (param $0 i32) (result i32) + (func $switch_reach (; 4 ;) (param $0 i32) (result i32) (local $1 i32) (local.set $1 (block $label$1 (result i32) @@ -172,11 +172,11 @@ ;;@ /tmp/emscripten_test_binaryen2_28hnAe/src.c:59950:0 (local.get $1) ) - (func $nofile (; 5 ;) (type $2) + (func $nofile (; 5 ;) ;;@ (unknown):1337:0 (call $nofile) ) - (func $inlineInto (; 6 ;) (type $1) (param $0 i32) (param $1 i32) (result i32) + (func $inlineInto (; 6 ;) (param $0 i32) (param $1 i32) (result i32) ;;@ inline_me.c:120:0 (i32.add (local.tee $0 |