aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2011-05-04 12:35:57 +0200
committerErlang/OTP <[email protected]>2011-05-04 12:35:57 +0200
commitc51a9d6863b370ac14c049f51cd6da6611704d1d (patch)
treeffb4a5c0c86f040e7c7f17fbd1cc945caec2347f
parentc2d329efd69a6040c94a724c935ce18e7edf0afe (diff)
parent4f56ab9f1f538ae94cd86bddd455ad266af7132e (diff)
downloadotp-c51a9d6863b370ac14c049f51cd6da6611704d1d.tar.gz
otp-c51a9d6863b370ac14c049f51cd6da6611704d1d.tar.bz2
otp-c51a9d6863b370ac14c049f51cd6da6611704d1d.zip
Merge branch 'sverker/halfword-ets-ordered_set-seq11836/OTP-9258' into maint-r14
* sverker/halfword-ets-ordered_set-seq11836/OTP-9258: Fix bug in halfword emulator causing ets:select_delete on ordered_set to crash
-rw-r--r--erts/emulator/beam/utils.c2
1 files changed, 1 insertions, 1 deletions
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;