diff options
| author | Sverker Eriksson <[email protected]> | 2011-05-05 15:05:11 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-05-05 15:05:11 +0200 |
| commit | 8e6ae6d0be47fa7785b40788b9adb46ba47b894e (patch) | |
| tree | c664ac5f3d09722ea6d4d8cc8f0943837242269d /erts | |
| parent | aa9497c99e4668c5f6a6a1bde2effcb8e9fb8617 (diff) | |
| parent | 7050c922b25fe1306caffc7545a89e0ddc1de06a (diff) | |
| download | otp-8e6ae6d0be47fa7785b40788b9adb46ba47b894e.tar.gz otp-8e6ae6d0be47fa7785b40788b9adb46ba47b894e.tar.bz2 otp-8e6ae6d0be47fa7785b40788b9adb46ba47b894e.zip | |
Merge branch 'maint-r14' into dev
Conflicts:
erts/vsn.mk
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 16 | ||||
| -rw-r--r-- | erts/emulator/beam/utils.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index e91839572b..f5607945a8 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -30,6 +30,22 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 5.8.3.2</title> + + <section><title>Known Bugs and Problems</title> + <list> + <item> + <p> + Fix halfword emulator bug in <c>ets:select_delete</c> for + <c>ordered_set</c> that caused emulator to crash.</p> + <p> + Own Id: OTP-9258 Aux Id: seq11836 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 5.8.3.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index f531d1430b..6b4f3b3b36 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -2705,7 +2705,7 @@ term_array: /* arrays in 'aa' and 'bb', length in 'i' */ while (--i) { a = *aa++; b = *bb++; - if (a != b) { + if (!is_same(a,a_base, b,b_base)) { if (is_atom(a) && is_atom(b)) { if ((j = cmp_atoms(a, b)) != 0) { goto not_equal; |