identify bug

Author: NickNick

tests/accumulate-from-tracked-fn.rs

@@ -12,29 +12,24 @@ struct List {
     next: Option<List>,
 }
 
+// Silence a warning about this not being used (it is).
+#[allow(unused)]
 #[salsa::accumulator]
 #[derive(Copy, Clone, Debug)]
 struct Integers(u32);
 
 #[salsa::tracked]
 fn compute(db: &dyn salsa::Database, input: List) {
-    eprintln!(
-        "{:?}(value={:?}, next={:?})",
-        input,
-        input.value(db),
-        input.next(db)
-    );
-    let result = if let Some(next) = input.next(db) {
-        let next_integers = compute::accumulated::<Integers>(db, next);
-        eprintln!("{next_integers:?}");
-        let v = input.value(db) + next_integers.iter().map(|a| a.0).sum::<u32>();
-        eprintln!("input={:?} v={:?}", input.value(db), v);
-        v
-    } else {
-        input.value(db)
-    };
-    Integers(result).accumulate(db);
-    eprintln!("pushed result {result:?}");
+    compute_single(db, input);
+    if let Some(next) = input.next(db) {
+        compute(db, next);
+    }
+}
+
+// In https://github.com/salsa-rs/salsa/issues/923 there was an issue specifically with tracked fn calling tracked fn.
+#[salsa::tracked]
+fn compute_single(db: &dyn salsa::Database, input: List) {
+    Integers(input.value(db)).accumulate(db);
 }
 
 #[test]
@@ -48,7 +43,7 @@ fn test1() {
     expect![[r#"
         [
             Integers(
-                11,
+                10,
             ),
             Integers(
                 1,
@@ -62,7 +57,21 @@ fn test1() {
     expect![[r#"
         [
             Integers(
-                12,
+                10,
+            ),
+            Integers(
+                2,
+            ),
+        ]
+    "#]]
+    .assert_debug_eq(&compute::accumulated::<Integers>(&db, l1));
+
+    l1.set_value(&mut db).to(11);
+    compute(&db, l1);
+    expect![[r#"
+        [
+            Integers(
+                11,
             ),
             Integers(
                 2,