3 files changed, 18 insertions, 11 deletions

diff --git a/erts/emulator/beam/erl_db_catree.c b/erts/emulator/beam/erl_db_catree.c
index 756f188983..5d88c61144 100644
--- a/erts/emulator/beam/erl_db_catree.c
+++ b/erts/emulator/beam/erl_db_catree.c
@@ -2111,9 +2111,9 @@ static int db_lookup_dbterm_catree(Process *p, DbTable *tbl, Eterm key, Eterm ob
         wunlock_adapt_base_node(tb, node, fbn.parent, fbn.current_level);
     } else {
         /* db_finalize_dbterm_catree will unlock */
-        handle->lck = fbn.parent;
-        handle->lck2 = node;
-        handle->current_level = fbn.current_level;
+        handle->u.catree.base_node = node;
+        handle->u.catree.parent = fbn.parent;
+        handle->u.catree.current_level = fbn.current_level;
     }
     return res;
 }
@@ -2121,10 +2121,10 @@ static int db_lookup_dbterm_catree(Process *p, DbTable *tbl, Eterm key, Eterm ob
 static void db_finalize_dbterm_catree(int cret, DbUpdateHandle *handle)
 {
     DbTableCATree *tb = &(handle->tb->catree);
-    DbTableCATreeNode *prev_node = handle->lck;    
-    DbTableCATreeNode *current_node = handle->lck2;
     db_finalize_dbterm_tree_common(cret, handle, NULL);
-    wunlock_adapt_base_node(tb, current_node, prev_node, handle->current_level);
+    wunlock_adapt_base_node(tb, handle->u.catree.base_node,
+                            handle->u.catree.parent,
+                            handle->u.catree.current_level);
     return;
 }
 
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index 61806876a7..f05a3b51c9 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -3103,7 +3103,7 @@ Ldone:
     handle->dbterm = &b->dbterm;
     handle->flags = flags;
     handle->new_size = b->dbterm.size;
-    handle->lck = lck;
+    handle->u.hash.lck = lck;
     return 1;
 }
 
@@ -3116,7 +3116,7 @@ db_finalize_dbterm_hash(int cret, DbUpdateHandle* handle)
     DbTableHash *tb = &tbl->hash;
     HashDbTerm **bp = (HashDbTerm **) handle->bp;
     HashDbTerm *b = *bp;
-    erts_rwmtx_t* lck = (erts_rwmtx_t*) handle->lck;
+    erts_rwmtx_t* lck = handle->u.hash.lck;
     HashDbTerm* free_me = NULL;
 
     ERTS_LC_ASSERT(IS_HASH_WLOCKED(tb, lck));  /* locked by db_lookup_dbterm_hash */
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h
index dcffaf9718..e1af9210ea 100644
--- a/erts/emulator/beam/erl_db_util.h
+++ b/erts/emulator/beam/erl_db_util.h
@@ -89,9 +89,16 @@ typedef struct {
     void** bp;         /* {Hash|Tree}DbTerm** */
     Uint new_size;
     int flags;
-    void* lck;
-    void* lck2;
-    int current_level;
+    union {
+        struct {
+            erts_rwmtx_t* lck;
+        } hash;
+        struct {
+            struct DbTableCATreeNode* base_node;
+            struct DbTableCATreeNode* parent;
+            int current_level;
+        } catree;
+    } u;
 } DbUpdateHandle;