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/emulator | |
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/emulator')
-rw-r--r-- | erts/emulator/beam/utils.c | 2 |
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; |