weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Remove redundant work

Browse Source
This commit is contained in:
Andrew Noyes
2024-01-23 10:29:33 -08:00
parent 836766132f
commit d68bd52122
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ConflictSet.cpp
View File

@@ -734,12 +734,8 @@ Node *&getOrCreateChild(Node *&self, uint8_t index) {
memcpy(newSelf, self, offsetof(Node, type)); memcpy(newSelf, self, offsetof(Node, type));
memcpy(newSelf->index, self4->index, 4); memcpy(newSelf->index, self4->index, 4);
memcpy(newSelf->children, self4->children, 4 * sizeof(void *)); memcpy(newSelf->children, self4->children, 4 * sizeof(void *));
free(self); free(std::exchange(self, newSelf));
self = newSelf;
setChildrenParents(self); setChildrenParents(self);
if (newSelf->parent) {
getOrCreateChild(newSelf->parent, newSelf->parentsIndex) = newSelf;
}
goto insert16; goto insert16;
} else { } else {
++self->numChildren; ++self->numChildren;
@@ -778,12 +774,8 @@ Node *&getOrCreateChild(Node *&self, uint8_t index) {
++i; ++i;
} }
assert(i == 16); assert(i == 16);
free(self); free(std::exchange(self, newSelf));
self = newSelf;
setChildrenParents(self); setChildrenParents(self);
if (newSelf->parent) {
getOrCreateChild(newSelf->parent, newSelf->parentsIndex) = newSelf;
}
goto insert48; goto insert48;
} else { } else {
++self->numChildren; ++self->numChildren;
@@ -817,12 +809,9 @@ Node *&getOrCreateChild(Node *&self, uint8_t index) {
newSelf->children[i] = self48->children[self48->index[i]]; newSelf->children[i] = self48->children[self48->index[i]];
} }
} }
free(self); free(std::exchange(self, newSelf));
self = newSelf; self = newSelf;
setChildrenParents(self); setChildrenParents(self);
if (newSelf->parent) {
getOrCreateChild(newSelf->parent, newSelf->parentsIndex) = newSelf;
}
goto insert256; goto insert256;
} else { } else {
++self->numChildren; ++self->numChildren;