Squashed 'deps/nostalgia/' changes from e40b1124..7e3e0461

7e3e0461 [ox/model] Fix possible infinite recursion

git-subtree-dir: deps/nostalgia
git-subtree-split: 7e3e0461097fb87807237e5494f8cd6ba289dd87
This commit is contained in:
Gary Talent 2025-01-23 23:51:13 -06:00
parent 2fbeb8c685
commit 897a59cdad

View File

@ -58,7 +58,11 @@ class TypeStore {
if (!std::is_constant_evaluated()) {
OX_REQUIRE_M(dt, loadDescriptor(typeId));
for (auto &f : dt->fieldList) {
OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
if (typeId == f.typeId) {
f.type = dt.get();
} else {
OX_RETURN_ERROR(this->getLoad(f.typeId).moveTo(f.type));
}
}
auto &out = m_cache[typeId];
out = std::move(dt);