diff options
| author | Rickard Green <[email protected]> | 2014-06-06 01:39:55 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-06-06 01:39:55 +0200 |
| commit | cb252aecf7da924e2959dadd390f1bbd320b2eb8 (patch) | |
| tree | 89558d2e19ffd3e197f0df43360e30ab633336b2 /erts/emulator/beam/erl_init.c | |
| parent | 29a3141244d09fda6700ab3016407c0fa52d92f6 (diff) | |
| parent | efa69184de378b99b1d222c5a0b1c07d9b5a39aa (diff) | |
| download | otp-cb252aecf7da924e2959dadd390f1bbd320b2eb8.tar.gz otp-cb252aecf7da924e2959dadd390f1bbd320b2eb8.tar.bz2 otp-cb252aecf7da924e2959dadd390f1bbd320b2eb8.zip | |
Merge branch 'rickard/yielding-binary-list-conversions/OTP-11888' into maint
* rickard/yielding-binary-list-conversions/OTP-11888:
Add test-case comparing old and new implementations
Make binary BIFs converting from lists yield on large input
Make binary BIFs converting to lists yield on large input
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index d54658f1ea..5e6d812242 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -324,7 +324,6 @@ erl_init(int ncpu, BIN_VH_MIN_SIZE = erts_next_heap_size(BIN_VH_MIN_SIZE, 0); erts_init_trace(); - erts_init_binary(); erts_init_bits(); erts_code_ix_init(); erts_init_fun_table(); @@ -337,6 +336,7 @@ erl_init(int ncpu, erts_ddll_init(); init_emulator(); erts_ptab_init(); /* Must be after init_emulator() */ + erts_init_binary(); /* Must be after init_emulator() */ erts_bp_init(); init_db(); /* Must be after init_emulator */ erts_bif_timer_init(); |