--- a/memory/build/rb.h
+++ b/memory/build/rb.h
@@ -127,37 +127,33 @@ template <typename T>
struct RedBlackTree
{
T* rbt_root;
T rbt_nil;
};
#define rb_node_field(a_node, a_field) (a_node)->a_field
-/* Left accessors. */
-#define rbp_left_set(a_type, a_field, a_node, a_left) \
- rb_node_field(a_node, a_field).SetLeft(a_left)
-
/* Right accessors. */
#define rbp_right_set(a_type, a_field, a_node, a_right) \
rb_node_field(a_node, a_field).SetRight(a_right)
/* Color accessors. */
#define rbp_color_set(a_type, a_field, a_node, a_red) \
rb_node_field(a_node, a_field) \
.SetColor(a_red ? NodeColor::Red : NodeColor::Black)
#define rbp_red_set(a_type, a_field, a_node) \
rb_node_field(a_node, a_field).SetColor(NodeColor::Red)
#define rbp_black_set(a_type, a_field, a_node) \
rb_node_field(a_node, a_field).SetColor(NodeColor::Black)
/* Node initializer. */
#define rbp_node_new(a_type, a_field, a_tree, a_node) \
do { \
- rbp_left_set(a_type, a_field, (a_node), &(a_tree)->rbt_nil); \
+ rb_node_field((a_node), a_field).SetLeft(&(a_tree)->rbt_nil); \
rbp_right_set(a_type, a_field, (a_node), &(a_tree)->rbt_nil); \
rbp_red_set(a_type, a_field, (a_node)); \
} while (0)
/* Tree initializer. */
#define rb_new(a_type, a_field, a_tree) \
do { \
(a_tree)->rbt_root = &(a_tree)->rbt_nil; \
@@ -311,24 +307,24 @@ struct RedBlackTree
* Find a match if it exists. Otherwise, find the previous lesser node, if one
* exists.
*/
#define rbp_rotate_left(a_type, a_field, a_node, r_node) \
do { \
(r_node) = rb_node_field((a_node), a_field).Right(); \
rbp_right_set( \
a_type, a_field, (a_node), rb_node_field((r_node), a_field).Left()); \
- rbp_left_set(a_type, a_field, (r_node), (a_node)); \
+ rb_node_field((r_node), a_field).SetLeft((a_node)); \
} while (0)
#define rbp_rotate_right(a_type, a_field, a_node, r_node) \
do { \
(r_node) = rb_node_field((a_node), a_field).Left(); \
- rbp_left_set( \
- a_type, a_field, (a_node), rb_node_field((r_node), a_field).Right()); \
+ rb_node_field((a_node), a_field) \
+ .SetLeft(rb_node_field((r_node), a_field).Right()); \
rbp_right_set(a_type, a_field, (r_node), (a_node)); \
} while (0)
#define rbp_lean_left(a_type, a_field, a_node, r_node) \
do { \
bool rbp_ll_red; \
rbp_rotate_left(a_type, a_field, (a_node), (r_node)); \
rbp_ll_red = rb_node_field((a_node), a_field).IsRed(); \
@@ -356,17 +352,17 @@ struct RedBlackTree
rbp_rotate_right(a_type, a_field, rbp_mrl_t, rbp_mrl_u); \
rbp_right_set(a_type, a_field, (a_node), rbp_mrl_u); \
rbp_rotate_left(a_type, a_field, (a_node), (r_node)); \
rbp_mrl_t = rb_node_field((a_node), a_field).Right(); \
if (rb_node_field(rbp_mrl_t, a_field).IsRed()) { \
rbp_black_set(a_type, a_field, rbp_mrl_t); \
rbp_red_set(a_type, a_field, (a_node)); \
rbp_rotate_left(a_type, a_field, (a_node), rbp_mrl_t); \
- rbp_left_set(a_type, a_field, (r_node), rbp_mrl_t); \
+ rb_node_field((r_node), a_field).SetLeft(rbp_mrl_t); \
} else { \
rbp_black_set(a_type, a_field, (a_node)); \
} \
} else { \
rbp_red_set(a_type, a_field, (a_node)); \
rbp_rotate_left(a_type, a_field, (a_node), (r_node)); \
} \
} while (0)
@@ -381,17 +377,17 @@ struct RedBlackTree
rbp_mrr_v = rb_node_field(rbp_mrr_u, a_field).Left(); \
if (rb_node_field(rbp_mrr_v, a_field).IsRed()) { \
rbp_color_set(a_type, \
a_field, \
rbp_mrr_u, \
rb_node_field((a_node), a_field).IsRed()); \
rbp_black_set(a_type, a_field, rbp_mrr_v); \
rbp_rotate_left(a_type, a_field, rbp_mrr_t, rbp_mrr_u); \
- rbp_left_set(a_type, a_field, (a_node), rbp_mrr_u); \
+ rb_node_field((a_node), a_field).SetLeft(rbp_mrr_u); \
rbp_rotate_right(a_type, a_field, (a_node), (r_node)); \
rbp_rotate_left(a_type, a_field, (a_node), rbp_mrr_t); \
rbp_right_set(a_type, a_field, (r_node), rbp_mrr_t); \
} else { \
rbp_color_set(a_type, \
a_field, \
rbp_mrr_t, \
rb_node_field((a_node), a_field).IsRed()); \
@@ -416,17 +412,17 @@ struct RedBlackTree
} while (0)
#define rb_insert(a_type, a_field, a_cmp, a_tree, a_node) \
do { \
a_type rbp_i_s; \
a_type *rbp_i_g, *rbp_i_p, *rbp_i_c, *rbp_i_t, *rbp_i_u; \
int rbp_i_cmp = 0; \
rbp_i_g = &(a_tree)->rbt_nil; \
- rbp_left_set(a_type, a_field, &rbp_i_s, (a_tree)->rbt_root); \
+ rb_node_field(&rbp_i_s, a_field).SetLeft((a_tree)->rbt_root); \
rbp_right_set(a_type, a_field, &rbp_i_s, &(a_tree)->rbt_nil); \
rbp_black_set(a_type, a_field, &rbp_i_s); \
rbp_i_p = &rbp_i_s; \
rbp_i_c = (a_tree)->rbt_root; \
/* Iteratively search down the tree for the insertion point, */ \
/* splitting 4-nodes as they are encountered. At the end of each */ \
/* iteration, rbp_i_g->rbp_i_p->rbp_i_c is a 3-level path down */ \
/* the tree, assuming a sufficiently deep tree. */ \
@@ -440,27 +436,27 @@ struct RedBlackTree
/* disruptiveness of node splitting. */ \
/* */ \
/* Rotate right. */ \
rbp_rotate_right(a_type, a_field, rbp_i_c, rbp_i_t); \
/* Pass red links up one level. */ \
rbp_i_u = rb_node_field(rbp_i_t, a_field).Left(); \
rbp_black_set(a_type, a_field, rbp_i_u); \
if (rb_node_field(rbp_i_p, a_field).Left() == rbp_i_c) { \
- rbp_left_set(a_type, a_field, rbp_i_p, rbp_i_t); \
+ rb_node_field(rbp_i_p, a_field).SetLeft(rbp_i_t); \
rbp_i_c = rbp_i_t; \
} else { \
/* rbp_i_c was the right child of rbp_i_p, so rotate */ \
/* left in order to maintain the left-leaning */ \
/* invariant. */ \
MOZ_ASSERT(rb_node_field(rbp_i_p, a_field).Right() == rbp_i_c); \
rbp_right_set(a_type, a_field, rbp_i_p, rbp_i_t); \
rbp_lean_left(a_type, a_field, rbp_i_p, rbp_i_u); \
if (rb_node_field(rbp_i_g, a_field).Left() == rbp_i_p) { \
- rbp_left_set(a_type, a_field, rbp_i_g, rbp_i_u); \
+ rb_node_field(rbp_i_g, a_field).SetLeft(rbp_i_u); \
} else { \
MOZ_ASSERT(rb_node_field(rbp_i_g, a_field).Right() == rbp_i_p); \
rbp_right_set(a_type, a_field, rbp_i_g, rbp_i_u); \
} \
rbp_i_p = rbp_i_u; \
rbp_i_cmp = (a_cmp)((a_node), rbp_i_p); \
if (rbp_i_cmp < 0) { \
rbp_i_c = rb_node_field(rbp_i_p, a_field).Left(); \
@@ -482,34 +478,34 @@ struct RedBlackTree
} \
} \
/* rbp_i_p now refers to the node under which to insert. */ \
rbp_node_new(a_type, a_field, a_tree, (a_node)); \
if (rbp_i_cmp > 0) { \
rbp_right_set(a_type, a_field, rbp_i_p, (a_node)); \
rbp_lean_left(a_type, a_field, rbp_i_p, rbp_i_t); \
if (rb_node_field(rbp_i_g, a_field).Left() == rbp_i_p) { \
- rbp_left_set(a_type, a_field, rbp_i_g, rbp_i_t); \
+ rb_node_field(rbp_i_g, a_field).SetLeft(rbp_i_t); \
} else if (rb_node_field(rbp_i_g, a_field).Right() == rbp_i_p) { \
rbp_right_set(a_type, a_field, rbp_i_g, rbp_i_t); \
} \
} else { \
- rbp_left_set(a_type, a_field, rbp_i_p, (a_node)); \
+ rb_node_field(rbp_i_p, a_field).SetLeft((a_node)); \
} \
/* Update the root and make sure that it is black. */ \
(a_tree)->rbt_root = rb_node_field(&rbp_i_s, a_field).Left(); \
rbp_black_set(a_type, a_field, (a_tree)->rbt_root); \
} while (0)
#define rb_remove(a_type, a_field, a_cmp, a_tree, a_node) \
do { \
a_type rbp_r_s; \
a_type *rbp_r_p, *rbp_r_c, *rbp_r_xp, *rbp_r_t, *rbp_r_u; \
int rbp_r_cmp; \
- rbp_left_set(a_type, a_field, &rbp_r_s, (a_tree)->rbt_root); \
+ rb_node_field(&rbp_r_s, a_field).SetLeft((a_tree)->rbt_root); \
rbp_right_set(a_type, a_field, &rbp_r_s, &(a_tree)->rbt_nil); \
rbp_black_set(a_type, a_field, &rbp_r_s); \
rbp_r_p = &rbp_r_s; \
rbp_r_c = (a_tree)->rbt_root; \
rbp_r_xp = &(a_tree)->rbt_nil; \
/* Iterate down the tree, but always transform 2-nodes to 3- or */ \
/* 4-nodes in order to maintain the invariant that the current */ \
/* node is not a 2-node. This allows simple deletion once a leaf */ \
@@ -519,17 +515,17 @@ struct RedBlackTree
if (rbp_r_cmp < 0) { \
rbp_r_t = rb_node_field(rbp_r_c, a_field).Left(); \
rbp_r_u = rb_node_field(rbp_r_t, a_field).Left(); \
if (rb_node_field(rbp_r_t, a_field).IsRed() == false && \
rb_node_field(rbp_r_u, a_field).IsRed() == false) { \
/* Apply standard transform to prepare for left move. */ \
rbp_move_red_left(a_type, a_field, rbp_r_c, rbp_r_t); \
rbp_black_set(a_type, a_field, rbp_r_t); \
- rbp_left_set(a_type, a_field, rbp_r_p, rbp_r_t); \
+ rb_node_field(rbp_r_p, a_field).SetLeft(rbp_r_t); \
rbp_r_c = rbp_r_t; \
} else { \
/* Move left. */ \
rbp_r_p = rbp_r_c; \
rbp_r_c = rb_node_field(rbp_r_c, a_field).Left(); \
} \
} else { \
if (rbp_r_cmp == 0) { \
@@ -537,17 +533,17 @@ struct RedBlackTree
if (rb_node_field(rbp_r_c, a_field).Right() == &(a_tree)->rbt_nil) { \
/* Delete root node (which is also a leaf node). */ \
if (rb_node_field(rbp_r_c, a_field).Left() != &(a_tree)->rbt_nil) { \
rbp_lean_right(a_type, a_field, rbp_r_c, rbp_r_t); \
rbp_right_set(a_type, a_field, rbp_r_t, &(a_tree)->rbt_nil); \
} else { \
rbp_r_t = &(a_tree)->rbt_nil; \
} \
- rbp_left_set(a_type, a_field, rbp_r_p, rbp_r_t); \
+ rb_node_field(rbp_r_p, a_field).SetLeft(rbp_r_t); \
} else { \
/* This is the node we want to delete, but we will */ \
/* instead swap it with its successor and delete the */ \
/* successor. Record enough information to do the */ \
/* swap later. rbp_r_xp is the a_node's parent. */ \
rbp_r_xp = rbp_r_p; \
rbp_r_cmp = 1; /* Note that deletion is incomplete. */ \
} \
@@ -571,17 +567,17 @@ struct RedBlackTree
rbp_rotate_right(a_type, a_field, rbp_r_c, rbp_r_t); \
rbp_rotate_left(a_type, a_field, rbp_r_c, rbp_r_u); \
rbp_right_set(a_type, a_field, rbp_r_t, rbp_r_u); \
} else { \
rbp_red_set(a_type, a_field, rbp_r_t); \
rbp_rotate_left(a_type, a_field, rbp_r_c, rbp_r_t); \
} \
} \
- rbp_left_set(a_type, a_field, rbp_r_p, rbp_r_t); \
+ rb_node_field(rbp_r_p, a_field).SetLeft(rbp_r_t); \
rbp_r_c = rbp_r_t; \
} else { \
/* Move right. */ \
rbp_r_p = rbp_r_c; \
rbp_r_c = rb_node_field(rbp_r_c, a_field).Right(); \
} \
} \
} \
@@ -591,48 +587,46 @@ struct RedBlackTree
rbp_r_cmp = (a_cmp)((a_node), rbp_r_c); \
if (rbp_r_cmp < 0) { \
rbp_r_t = rb_node_field(rbp_r_c, a_field).Left(); \
if (rbp_r_t == &(a_tree)->rbt_nil) { \
/* rbp_r_c now refers to the successor node to */ \
/* relocate, and rbp_r_xp/a_node refer to the */ \
/* context for the relocation. */ \
if (rb_node_field(rbp_r_xp, a_field).Left() == (a_node)) { \
- rbp_left_set(a_type, a_field, rbp_r_xp, rbp_r_c); \
+ rb_node_field(rbp_r_xp, a_field).SetLeft(rbp_r_c); \
} else { \
MOZ_ASSERT(rb_node_field(rbp_r_xp, a_field).Right() == \
(a_node)); \
rbp_right_set(a_type, a_field, rbp_r_xp, rbp_r_c); \
} \
- rbp_left_set(a_type, \
- a_field, \
- rbp_r_c, \
- rb_node_field((a_node), a_field).Left()); \
+ rb_node_field(rbp_r_c, a_field) \
+ .SetLeft(rb_node_field((a_node), a_field).Left()); \
rbp_right_set(a_type, \
a_field, \
rbp_r_c, \
rb_node_field((a_node), a_field).Right()); \
rbp_color_set(a_type, \
a_field, \
rbp_r_c, \
rb_node_field((a_node), a_field).IsRed()); \
if (rb_node_field(rbp_r_p, a_field).Left() == rbp_r_c) { \
- rbp_left_set(a_type, a_field, rbp_r_p, &(a_tree)->rbt_nil); \
+ rb_node_field(rbp_r_p, a_field).SetLeft(&(a_tree)->rbt_nil); \
} else { \
MOZ_ASSERT(rb_node_field(rbp_r_p, a_field).Right() == rbp_r_c); \
rbp_right_set(a_type, a_field, rbp_r_p, &(a_tree)->rbt_nil); \
} \
break; \
} \
rbp_r_u = rb_node_field(rbp_r_t, a_field).Left(); \
if (rb_node_field(rbp_r_t, a_field).IsRed() == false && \
rb_node_field(rbp_r_u, a_field).IsRed() == false) { \
rbp_move_red_left(a_type, a_field, rbp_r_c, rbp_r_t); \
if (rb_node_field(rbp_r_p, a_field).Left() == rbp_r_c) { \
- rbp_left_set(a_type, a_field, rbp_r_p, rbp_r_t); \
+ rb_node_field(rbp_r_p, a_field).SetLeft(rbp_r_t); \
} else { \
rbp_right_set(a_type, a_field, rbp_r_p, rbp_r_t); \
} \
rbp_r_c = rbp_r_t; \
} else { \
rbp_r_p = rbp_r_c; \
rbp_r_c = rb_node_field(rbp_r_c, a_field).Left(); \
} \
@@ -647,17 +641,17 @@ struct RedBlackTree
if (rb_node_field(rbp_r_c, a_field).Left() != \
&(a_tree)->rbt_nil) { \
rbp_lean_right(a_type, a_field, rbp_r_c, rbp_r_t); \
rbp_right_set(a_type, a_field, rbp_r_t, &(a_tree)->rbt_nil); \
} else { \
rbp_r_t = &(a_tree)->rbt_nil; \
} \
if (rb_node_field(rbp_r_p, a_field).Left() == rbp_r_c) { \
- rbp_left_set(a_type, a_field, rbp_r_p, rbp_r_t); \
+ rb_node_field(rbp_r_p, a_field).SetLeft(rbp_r_t); \
} else { \
rbp_right_set(a_type, a_field, rbp_r_p, rbp_r_t); \
} \
break; \
} else { \
/* This is the node we want to delete, but we */ \
/* will instead swap it with its successor */ \
/* and delete the successor. Record enough */ \
@@ -666,17 +660,17 @@ struct RedBlackTree
rbp_r_xp = rbp_r_p; \
} \
} \
rbp_r_t = rb_node_field(rbp_r_c, a_field).Right(); \
rbp_r_u = rb_node_field(rbp_r_t, a_field).Left(); \
if (rb_node_field(rbp_r_u, a_field).IsRed() == false) { \
rbp_move_red_right(a_type, a_field, rbp_r_c, rbp_r_t); \
if (rb_node_field(rbp_r_p, a_field).Left() == rbp_r_c) { \
- rbp_left_set(a_type, a_field, rbp_r_p, rbp_r_t); \
+ rb_node_field(rbp_r_p, a_field).SetLeft(rbp_r_t); \
} else { \
rbp_right_set(a_type, a_field, rbp_r_p, rbp_r_t); \
} \
rbp_r_c = rbp_r_t; \
} else { \
rbp_r_p = rbp_r_c; \
rbp_r_c = rb_node_field(rbp_r_c, a_field).Right(); \
} \