diff options
| author | John Högberg <[email protected]> | 2018-06-26 07:17:17 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-06-26 07:17:17 +0200 |
| commit | a4381a973e2efcd7c1fd1e0f2e9e6619b9b59c67 (patch) | |
| tree | 6e6b789d1a6e9e8781265d88f5537af84e3586af /lib/compiler/src | |
| parent | 42901d90e4bdd44949a13488d228b77f0eda5aa9 (diff) | |
| parent | a09907d56e29b24ded9a34de82bceac7f39021d1 (diff) | |
| download | otp-a4381a973e2efcd7c1fd1e0f2e9e6619b9b59c67.tar.gz otp-a4381a973e2efcd7c1fd1e0f2e9e6619b9b59c67.tar.bz2 otp-a4381a973e2efcd7c1fd1e0f2e9e6619b9b59c67.zip | |
Merge branch 'maint-21' into maint
* maint-21:
Updated OTP version
Prepare release
Fix unsafe optimization when running beam_block the second time
Fix environment case sensitivity issues on Windows
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/beam_utils.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl index 5510624b2d..ff587c4982 100644 --- a/lib/compiler/src/beam_utils.erl +++ b/lib/compiler/src/beam_utils.erl @@ -1105,8 +1105,12 @@ defs([{bif,_,{f,Fail},_Src,Dst}=I|Is], Regs0, D) -> defs([{block,Block0}|Is], Regs0, D0) -> {Block,Regs,D} = defs_list(Block0, Regs0, D0), [{block,[make_anno({def,Regs0})|Block]}|defs(Is, Regs, D)]; -defs([{bs_init,{f,L},_,_,_,Dst}=I|Is], Regs0, D) -> - Regs = def_regs([Dst], Regs0), +defs([{bs_init,{f,L},_,Live,_,Dst}=I|Is], Regs0, D) -> + Regs1 = case Live of + none -> Regs0; + _ -> init_def_regs(Live) + end, + Regs = def_regs([Dst], Regs1), [I|defs(Is, Regs, update_regs(L, Regs, D))]; defs([{bs_put,{f,L},_,_}=I|Is], Regs, D) -> [I|defs(Is, Regs, update_regs(L, Regs, D))]; |