diff options
| author | Sverker Eriksson <[email protected]> | 2013-12-17 13:20:31 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-12-17 13:20:31 +0100 |
| commit | 165846b143c8275350972caaf4c1013cfe5db043 (patch) | |
| tree | 8ec4ddea514aa1a0e94249328a77df91d5195ebf /lib | |
| parent | 7d4e5e2458e0627882f49078b9757dd6ae21a6fe (diff) | |
| parent | 4b3462665c591dffa05294ce5ea94c6259446a04 (diff) | |
| download | otp-165846b143c8275350972caaf4c1013cfe5db043.tar.gz otp-165846b143c8275350972caaf4c1013cfe5db043.tar.bz2 otp-165846b143c8275350972caaf4c1013cfe5db043.zip | |
Merge tag 'OTP_R16B03_yielding_binary_to_term'
Yielding binary_to_term.
OTP-11535
* tag 'OTP_R16B03_yielding_binary_to_term':
Increase versions for OTP_R16B03_yielding_binary_to_term
erts: Adjust term_to_binary reduction factors
erts: Yield after trapping term_to_binary if gc has been ordered
erts: Let term_to_binary disable gc while trapping
erts: Improve stress of binary_to_term in binary_SUITE
erts: Fix bug in binary_to_term for compressed on halfword
erts: Fix crash when binary_to_term throws badarg
erts: Trapping memcpy in binary_to_term
erts: Cleanup code for trapping binary_to_term
erts: Add erlang wrappers to binary_to_term
trapping uncompress
trapping size calculation
trapping binary_to_term/2
trapping STRING_EXT
trapping lists and tuples
trapping binary_to_term passing binary_SUITE
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
erts/vsn.mk
lib/kernel/vsn.mk
lib/stdlib/vsn.mk
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tools/test/xref_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl index 3e9eaf259c..353275ae3b 100644 --- a/lib/tools/test/xref_SUITE.erl +++ b/lib/tools/test/xref_SUITE.erl @@ -1098,6 +1098,7 @@ read_expected(Version) -> {POS1+1,{FF,{mod17,fun17,0}}}, {POS1+2,{FF,{erlang,spawn,1}}}, {POS1+2,{FF,{read,local,0}}}, + {POS1+3,{FF,{erlang,binary_to_term,1}}}, {POS1+3,{FF,{erlang,spawn,1}}}, {POS1+4,{FF,{dist,func,0}}}, {POS1+4,{FF,{erlang,spawn,1}}}, @@ -1206,7 +1207,6 @@ read_expected(Version) -> OKB1 = [{POS13+1,{FF,{erts_debug,apply,4}}}, {POS13+2,{FF,{erts_debug,apply,4}}}, {POS13+3,{FF,{erts_debug,apply,4}}}, - {POS1+3, {FF,{erlang,binary_to_term,1}}}, {POS3+1, {FF,{erlang,spawn,3}}}, {POS3+2, {FF,{erlang,spawn,3}}}, {POS3+3, {FF,{erlang,spawn_link,3}}}, |