diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2017-03-03 10:51:46 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2017-03-03 10:51:46 +0100 |
| commit | 79422f489a619df0bb6fcd32ce494fb9cefdaa12 (patch) | |
| tree | bd39cf79ae9ed44a5875d3f27e8184e0088574d8 /erts/emulator/beam/copy.c | |
| parent | b03fffab761b99efdac70816af25f4d8df1f2a49 (diff) | |
| parent | b9847009f7ca88f61adb21f4de9db54fc1c7e96a (diff) | |
| download | otp-79422f489a619df0bb6fcd32ce494fb9cefdaa12.tar.gz otp-79422f489a619df0bb6fcd32ce494fb9cefdaa12.tar.bz2 otp-79422f489a619df0bb6fcd32ce494fb9cefdaa12.zip | |
Merge branch 'egil/erts/sub-binary-to-heap-binary/OTP-14149'
* egil/erts/sub-binary-to-heap-binary/OTP-14149:
observer: Fix crashdump viewer testcase
erts: Refactor MOVE_CONS to inline function
erts: Refactor MOVE_BOXED to inline function
erts: Convert small sub-binaries to heap-binaries
Diffstat (limited to 'erts/emulator/beam/copy.c')
| -rw-r--r-- | erts/emulator/beam/copy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/copy.c b/erts/emulator/beam/copy.c index 85db23393c..e567eabc82 100644 --- a/erts/emulator/beam/copy.c +++ b/erts/emulator/beam/copy.c @@ -1990,7 +1990,7 @@ move_one_frag(Eterm** hpp, ErlHeapFragment* frag, ErlOffHeap* off_heap, int lite if (is_header(val)) { struct erl_off_heap_header* hdr = (struct erl_off_heap_header*)hp; ASSERT(ptr + header_arity(val) < end); - MOVE_BOXED(ptr, val, hp, &dummy_ref); + move_boxed(&ptr, val, &hp, &dummy_ref); switch (val & _HEADER_SUBTAG_MASK) { case REF_SUBTAG: if (is_ordinary_ref_thing(hdr)) @@ -2007,7 +2007,7 @@ move_one_frag(Eterm** hpp, ErlHeapFragment* frag, ErlOffHeap* off_heap, int lite } else { /* must be a cons cell */ ASSERT(ptr+1 < end); - MOVE_CONS(ptr, val, hp, &dummy_ref); + move_cons(&ptr, val, &hp, &dummy_ref); ptr += 2; } } |