diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2013-02-25 18:05:34 +0100 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2013-02-25 18:05:45 +0100 |
| commit | 2ca1d65b89b8d77156dcce07e9d4c24b1e8ca534 (patch) | |
| tree | e61e43a95a8d3f2315464847c3150769ed0086a2 | |
| parent | f616e2011a0ee575c4f51e191648752779e8e64b (diff) | |
| parent | 79af83c9903432e68fbe233a2b4f5fe7ea7278b1 (diff) | |
| download | erlang-2ca1d65b89b8d77156dcce07e9d4c24b1e8ca534.tar.gz | |
Merge branch 'sverk/halfword-loading-crash'
* sverk/halfword-loading-crash:
erts: Fix crash on halfword and code_SUITE:big_boot_embedded
OTP-10896
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index 81c1ea749a..bd4e5a52d0 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -205,7 +205,7 @@ typedef struct { typedef struct { Eterm term; /* The tagged term (in the heap). */ Uint heap_size; /* (Exact) size on the heap. */ - Uint offset; /* Offset from temporary location to final. */ + SWord offset; /* Offset from temporary location to final. */ ErlOffHeap off_heap; /* Start of linked list of ProcBins. */ Eterm* heap; /* Heap for term. */ } Literal; @@ -4045,7 +4045,7 @@ freeze_code(LoaderState* stp) code[MI_LITERALS_END] = (BeamInstr) high; ptr = low; for (i = 0; i < stp->num_literals; i++) { - Uint offset; + SWord offset; struct erl_off_heap_header* t_off_heap; sys_memcpy(ptr, stp->literals[i].heap, |