diff options
| author | Rickard Green <[email protected]> | 2015-11-12 15:44:56 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-11-12 15:44:56 +0100 |
| commit | ef72a791f4dc9a1816ac8ff95a612409b86de818 (patch) | |
| tree | 495fd4968a7794cb150754cf1acf3c6b79dc7d30 /erts/emulator/beam/beam_emu.c | |
| parent | 0a4d4450d2143ca824644c6da96f98fc95811e3e (diff) | |
| parent | 7858ca939f8bf2db918396616fee13364d150a1e (diff) | |
| download | otp-ef72a791f4dc9a1816ac8ff95a612409b86de818.tar.gz otp-ef72a791f4dc9a1816ac8ff95a612409b86de818.tar.bz2 otp-ef72a791f4dc9a1816ac8ff95a612409b86de818.zip | |
Merge branch 'sverk/literal-memory-range'
* sverk/literal-memory-range:
erts: Refactor line table in loaded beam code
erts: Refactor header of loaded beam code
fix check_process_code for separate literal area
erts: Add support for fast erts_is_literal()
erts: Refactor erl_mmap to allow several mapper instances
erts: Add new allocator LITERAL
erts: Fix strangeness in treatment of MSEG_ALIGN_BITS
erts: Cleanup main carrier creation
erts: Remove unused erts_have_erts_mmap
erts: Refactor config test for posix_memalign
Diffstat (limited to 'erts/emulator/beam/beam_emu.c')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index faf496a030..f15b98eb58 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -6080,7 +6080,7 @@ call_fun(Process* p, /* Current process. */ */ module = fe->module; if ((modp = erts_get_module(module, code_ix)) != NULL - && modp->curr.code != NULL) { + && modp->curr.code_hdr != NULL) { /* * There is a module loaded, but obviously the fun is not * defined in it. We must not call the error_handler |