diff options
| author | Rickard Green <[email protected]> | 2016-08-29 17:52:10 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-29 17:52:10 +0200 |
| commit | 928d74ffa09bd56652d9390b02fa51ef51d71d51 (patch) | |
| tree | bfb9cd9e76d4ef766dbcd999adf16c700350b399 /erts/preloaded/ebin | |
| parent | 69d442f8afc67aef33c70d68d7eaab2bdad1400f (diff) | |
| parent | 9d0638216d35ca0f21c1eea20f8daa3992ac4f71 (diff) | |
| download | otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.tar.gz otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.tar.bz2 otp-928d74ffa09bd56652d9390b02fa51ef51d71d51.zip | |
Merge branch 'rickard/fun-purge-bug/OTP-13809' and 'rickard/new-purge-strategy/OTP-13833' into maint
* rickard/fun-purge-bug/OTP-13809:
Fix purge of code
Reclaim literal area after purge has completed
Separate literal area from code
Conflicts:
erts/doc/src/erlang.xml
erts/emulator/beam/beam_bif_load.c
erts/emulator/beam/erl_init.c
erts/preloaded/ebin/init.beam
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/erts_code_purger.beam | bin | 8696 -> 11168 bytes |
| -rw-r--r-- | erts/preloaded/ebin/erts_internal.beam | bin | 10536 -> 10432 bytes |
| -rw-r--r-- | erts/preloaded/ebin/erts_literal_area_collector.beam | bin | 0 -> 3304 bytes |
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 50036 -> 50032 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erts_code_purger.beam b/erts/preloaded/ebin/erts_code_purger.beam Binary files differindex a0da864824..a1eb126098 100644 --- a/erts/preloaded/ebin/erts_code_purger.beam +++ b/erts/preloaded/ebin/erts_code_purger.beam diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam Binary files differindex d897c8e92f..8d4ca152de 100644 --- a/erts/preloaded/ebin/erts_internal.beam +++ b/erts/preloaded/ebin/erts_internal.beam diff --git a/erts/preloaded/ebin/erts_literal_area_collector.beam b/erts/preloaded/ebin/erts_literal_area_collector.beam Binary files differnew file mode 100644 index 0000000000..71f3c2ec8c --- /dev/null +++ b/erts/preloaded/ebin/erts_literal_area_collector.beam diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex f0344fd6ba..849273f746 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam |