diff options
| author | Lukas Larsson <[email protected]> | 2017-04-20 10:10:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-04-20 10:10:33 +0200 |
| commit | f9ccb1d717a7bffaaf149b6199412cfb092e692b (patch) | |
| tree | e35d2f288af9fb205116d23df100d0c3c28bd3b8 /erts/emulator/beam/beam_debug.c | |
| parent | c6e15b7226fab368babb60704e863cb17ba627ba (diff) | |
| parent | 8c665562272bac669ea400638d379f21495636af (diff) | |
| download | otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.tar.gz otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.tar.bz2 otp-f9ccb1d717a7bffaaf149b6199412cfb092e692b.zip | |
Merge branch 'lukas/erts/20_minor_fixes'
* lukas/erts/20_minor_fixes:
erts: Rebuild etc executables if config.h changes
erts: Fix new gcc warning in check io
kernel: Add mem check to prim_file:large_write tc
erts: Fix two compiler warnings on OS X
erts: Fix erts_debug:df function info output
erts: Get rid of some unused function warnings on os x
Diffstat (limited to 'erts/emulator/beam/beam_debug.c')
| -rw-r--r-- | erts/emulator/beam/beam_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_debug.c b/erts/emulator/beam/beam_debug.c index 37d8699a4b..3f4a1f9e80 100644 --- a/erts/emulator/beam/beam_debug.c +++ b/erts/emulator/beam/beam_debug.c @@ -308,7 +308,7 @@ erts_debug_disassemble_1(BIF_ALIST_1) BIF_RET(am_undef); } } - code_ptr = erts_codemfa_to_code(cmfa); + code_ptr = (BeamInstr*)erts_code_to_codeinfo(erts_codemfa_to_code(cmfa)); } else { goto error; } |