diff options
| author | Sverker Eriksson <[email protected]> | 2010-12-22 15:14:39 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-02-03 17:33:44 +0100 |
| commit | 0b09ffabadd38bd2d0fa9cfa735542defc380efc (patch) | |
| tree | d061b64f2ca8806f961754d78b518c9735e48437 /erts/emulator/beam/erl_db_util.c | |
| parent | 359517b5177756d871b91757160e6840e0fbfe4a (diff) | |
| download | otp-0b09ffabadd38bd2d0fa9cfa735542defc380efc.tar.gz otp-0b09ffabadd38bd2d0fa9cfa735542defc380efc.tar.bz2 otp-0b09ffabadd38bd2d0fa9cfa735542defc380efc.zip | |
HALFWORD ETS 32-bit arch fixes and other cleanups
Diffstat (limited to 'erts/emulator/beam/erl_db_util.c')
| -rw-r--r-- | erts/emulator/beam/erl_db_util.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/erts/emulator/beam/erl_db_util.c b/erts/emulator/beam/erl_db_util.c index 3883ff69fa..7a6a811a60 100644 --- a/erts/emulator/beam/erl_db_util.c +++ b/erts/emulator/beam/erl_db_util.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1998-2010. All Rights Reserved. + * Copyright Ericsson AB 1998-2011. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -1915,11 +1915,13 @@ restart: *esp++ = hp[n]; break; case matchPushExpr: - ASSERT(is_tuple_rel(term,base)); #if HALFWORD_HEAP if (base) { - Uint sz = size_object_rel(term, base); - Eterm* top = HAlloc(psp, sz); + Uint sz; + Eterm* top; + ASSERT(is_tuple_rel(term,base)); /* assume ETS */ + sz = size_object_rel(term, base); + top = HAlloc(psp, sz); *esp++ = copy_shallow_rel(tuple_val_rel(term,base), sz, &top, &MSO(psp), base); break; |