#2011 Fix issue with deferred calls to modified() for DontFragment components

Author: SanderMertens

distr/flecs.c

@@ -10121,13 +10121,13 @@ void flecs_modified_id_if(
     ecs_assert(table != NULL, ECS_INTERNAL_ERROR, NULL);
 
     ecs_component_record_t *cr = flecs_components_get(world, component);
-    if (!cr || !flecs_component_get_table(cr, table)) {
+    int32_t row = ECS_RECORD_TO_ROW(r->row);
+    if (!cr || !flecs_get_component(world, table, row, cr)) {
         flecs_defer_end(world, stage);
         return;
     }
 
-    flecs_notify_on_set(
-        world, table, ECS_RECORD_TO_ROW(r->row), component, invoke_hook);
+    flecs_notify_on_set(world, table, row, component, invoke_hook);
 
     flecs_table_mark_dirty(world, table, component);
     flecs_defer_end(world, stage);

src/entity.c

@@ -2241,13 +2241,13 @@ void flecs_modified_id_if(
     ecs_assert(table != NULL, ECS_INTERNAL_ERROR, NULL);
 
     ecs_component_record_t *cr = flecs_components_get(world, component);
-    if (!cr || !flecs_component_get_table(cr, table)) {
+    int32_t row = ECS_RECORD_TO_ROW(r->row);
+    if (!cr || !flecs_get_component(world, table, row, cr)) {
         flecs_defer_end(world, stage);
         return;
     }
 
-    flecs_notify_on_set(
-        world, table, ECS_RECORD_TO_ROW(r->row), component, invoke_hook);
+    flecs_notify_on_set(world, table, row, component, invoke_hook);
 
     flecs_table_mark_dirty(world, table, component);
     flecs_defer_end(world, stage);

test/core/project.json

@@ -742,7 +742,8 @@
                 "defer_add_two_sparse_w_observer",
                 "defer_remove_two_sparse_w_observer",
                 "defer_set_batch_two_sparse_w_observer",
-                "defer_set_w_sparse_w_observer"
+                "defer_set_w_sparse_w_observer",
+                "defer_ensure_modified_w_sparse_w_observer"
             ]
         }, {
             "id": "NonFragmentingChildOf",

test/core/src/Sparse.c

@@ -7425,3 +7425,36 @@ void Sparse_defer_set_w_sparse_w_observer(void) {
 
     ecs_fini(world);
 }
+
+void Sparse_defer_ensure_modified_w_sparse_w_observer(void) {
+    ecs_world_t *world = ecs_mini();
+
+    ECS_COMPONENT(world, Position);
+    ecs_add_id(world, ecs_id(Position), EcsSparse);
+    ecs_add_id(world, ecs_id(Position), EcsDontFragment);
+
+    ecs_observer(world, {
+        .query.terms = {{ .id = ecs_id(Position) }},
+        .events = { EcsOnSet },
+        .callback = DataOnSet
+    });
+
+    ecs_entity_t e = ecs_new(world);
+    ecs_set(world, e, Position, { 42 });
+
+    test_int(DataOnSet_invoked, 1);
+
+    DataOnSet_invoked = 0;
+
+    ecs_defer_begin(world);
+    Position *ptr = ecs_ensure(world, e, Position);
+    ptr->x = 77;
+    ecs_modified(world, e, Position);
+    ecs_defer_end(world);
+
+    test_int(DataOnSet_invoked, 1);
+    test_int(DataOnSet_value, 77);
+
+    ecs_fini(world);
+}
+

test/core/src/main.c

@@ -713,6 +713,7 @@ void Sparse_defer_add_two_sparse_w_observer(void);
 void Sparse_defer_remove_two_sparse_w_observer(void);
 void Sparse_defer_set_batch_two_sparse_w_observer(void);
 void Sparse_defer_set_w_sparse_w_observer(void);
+void Sparse_defer_ensure_modified_w_sparse_w_observer(void);
 
 // Testsuite 'NonFragmentingChildOf'
 void NonFragmentingChildOf_set_parent_no_ordered_children(void);
@@ -5986,6 +5987,10 @@ bake_test_case Sparse_testcases[] = {
     {
         "defer_set_w_sparse_w_observer",
         Sparse_defer_set_w_sparse_w_observer
+    },
+    {
+        "defer_ensure_modified_w_sparse_w_observer",
+        Sparse_defer_ensure_modified_w_sparse_w_observer
     }
 };
 
@@ -15916,7 +15921,7 @@ static bake_test_suite suites[] = {
         "Sparse",
         Sparse_setup,
         NULL,
-        223,
+        224,
         Sparse_testcases,
         1,
         Sparse_params