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 | |
| 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')
| -rw-r--r-- | erts/emulator/beam/beam_debug.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 4 |
2 files changed, 4 insertions, 2 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; } diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 6b5b64993f..894e0ee582 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -280,6 +280,7 @@ schdlr_sspnd_get_nscheds(ErtsSchedTypeCounters *valp, } } +#ifdef DEBUG static ERTS_INLINE Uint32 schdlr_sspnd_get_nscheds_tot(ErtsSchedTypeCounters *valp) { @@ -290,6 +291,7 @@ schdlr_sspnd_get_nscheds_tot(ErtsSchedTypeCounters *valp) #endif return res; } +#endif static ERTS_INLINE void schdlr_sspnd_dec_nscheds(ErtsSchedTypeCounters *valp, @@ -11374,7 +11376,7 @@ erts_execute_dirty_system_task(Process *c_p) switch (st->type) { case ERTS_PSTT_CLA: - ASSERT(is_value(st_res)); + ASSERT(is_value(cla_res)); st_res = cla_res; break; case ERTS_PSTT_GC_MAJOR: |