summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-05-23 15:43:46 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2023-05-23 15:43:46 +0000
commit5f96fe1bdfce6e74d5f3ab93fdb4c0a6fedb79a7 (patch)
treedab7754832e495f278b62a2f0f7a5cfd958fcb17
parent6525002fecd469b420615e5e1e0b1138234d9189 (diff)
Remove asserts now guaranteed at memory allocation level.
-rw-r--r--vespalib/src/vespa/vespalib/btree/btreeiterator.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/vespalib/src/vespa/vespalib/btree/btreeiterator.h b/vespalib/src/vespa/vespalib/btree/btreeiterator.h
index 7ab28c9b5c9..01f0ad3c2d3 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeiterator.h
+++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.h
@@ -48,13 +48,12 @@ class NodeElement
static_assert((NodeType::maxSlots() + 1) < (1ul << IDX_BITS), "IDX can be out of bounds above 127");
public:
NodeElement() noexcept : _nodeAndIdx(0ul) { }
- NodeElement(const NodeType *node, uint32_t idx) noexcept : _nodeAndIdx(uint64_t(node) | uint64_t(idx) << IDX_SHIFT) {
- assert((uint64_t(node) & ~NODE_MASK) == 0ul);
- }
+ NodeElement(const NodeType *node, uint32_t idx) noexcept
+ : _nodeAndIdx(uint64_t(node) | uint64_t(idx) << IDX_SHIFT)
+ { }
void invalidate() noexcept { _nodeAndIdx = 0; }
void setNode(const NodeType *node) noexcept {
- assert((uint64_t(node) & ~NODE_MASK) == 0ul);
_nodeAndIdx = (_nodeAndIdx & ~NODE_MASK) | uint64_t(node);
}
const NodeType * getNode() const noexcept { return reinterpret_cast<const NodeType *>(_nodeAndIdx & NODE_MASK); }
@@ -66,7 +65,6 @@ public:
void decIdx() noexcept { _nodeAndIdx -= IDX_ONE; }
void setNodeAndIdx(const NodeType *node, uint32_t idx) noexcept {
- assert((uint64_t(node) & ~NODE_MASK) == 0ul);
_nodeAndIdx = uint64_t(node) | uint64_t(idx) << IDX_SHIFT;
}