diff options
| author | Björn Gustavsson <[email protected]> | 2019-06-17 12:58:57 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2019-06-17 12:58:57 +0200 |
| commit | 0a63f32c0cf828d07c33e4dd68ae561571279fe7 (patch) | |
| tree | 9482190f7a64c42e4731149066c7ac8e06b16ca9 /lib/compiler/src/compile.erl | |
| parent | d3f4351b6fc846f55fae221760da9b4c04560007 (diff) | |
| parent | fccac1598cc13fcd9a3d7e85e2c4cae722f1bfc4 (diff) | |
| download | otp-0a63f32c0cf828d07c33e4dd68ae561571279fe7.tar.gz otp-0a63f32c0cf828d07c33e4dd68ae561571279fe7.tar.bz2 otp-0a63f32c0cf828d07c33e4dd68ae561571279fe7.zip | |
Merge branch 'bjorn/better-fun-info/OTP-15837'
* bjorn/better-fun-info/OTP-15837:
Create a shared wrapper function for all occurrences of 'fun F/A'
Support sharing of fun entries in the runtime system
erl_fun.c: Remove unused struct definition
hipe: Use the new index when translating funs
Stop supporting decoding of old funs in the external term format
genop.tab: Insert an "OTP 23" comment for clarity
Diffstat (limited to 'lib/compiler/src/compile.erl')
| -rw-r--r-- | lib/compiler/src/compile.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index 098f82fdc0..42f9e8b902 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -265,9 +265,10 @@ expand_opt(r19, Os) -> expand_opt(r20, Os) -> expand_opt_before_21(Os); expand_opt(r21, Os) -> - [no_swap, no_put_tuple2 | expand_opt(no_bsm3, Os)]; + [no_shared_fun_wrappers, + no_swap, no_put_tuple2 | expand_opt(no_bsm3, Os)]; expand_opt(r22, Os) -> - [no_swap | Os]; + [no_shared_fun_wrappers, no_swap | Os]; expand_opt({debug_info_key,_}=O, Os) -> [encrypt_debug_info,O|Os]; expand_opt(no_type_opt, Os) -> @@ -277,7 +278,8 @@ expand_opt(no_type_opt, Os) -> expand_opt(O, Os) -> [O|Os]. expand_opt_before_21(Os) -> - [no_swap, no_put_tuple2, no_get_hd_tl, no_ssa_opt_record, + [no_shared_fun_wrappers, no_swap, + no_put_tuple2, no_get_hd_tl, no_ssa_opt_record, no_utf8_atoms | expand_opt(no_bsm3, Os)]. %% format_error(ErrorDescriptor) -> string() |