From 77599c762ea8e6eea6ef021be54973325b79b860 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Wed, 30 Apr 2025 17:52:42 +0200 Subject: [PATCH 1/2] feat: Improve debug name for interned query arguments --- components/salsa-macro-rules/src/setup_tracked_fn.rs | 2 +- tests/cycle_output.rs | 6 +++--- tests/preverify-struct-with-leaked-data-2.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/salsa-macro-rules/src/setup_tracked_fn.rs b/components/salsa-macro-rules/src/setup_tracked_fn.rs index 790dc6a9b..e27808a1f 100644 --- a/components/salsa-macro-rules/src/setup_tracked_fn.rs +++ b/components/salsa-macro-rules/src/setup_tracked_fn.rs @@ -139,7 +139,7 @@ macro_rules! setup_tracked_fn { file: file!(), line: line!(), }; - const DEBUG_NAME: &'static str = "Configuration"; + const DEBUG_NAME: &'static str = concat!(stringify!($fn_name), "_arguments"); type Fields<$db_lt> = ($($input_ty),*); diff --git a/tests/cycle_output.rs b/tests/cycle_output.rs index 72a52b774..47b3bf038 100644 --- a/tests/cycle_output.rs +++ b/tests/cycle_output.rs @@ -141,10 +141,10 @@ fn revalidate_no_changes() { [ "salsa_event(DidSetCancellationFlag)", "salsa_event(DidValidateMemoizedValue { database_key: read_value(Id(403)) })", - "salsa_event(DidReinternValue { key: Configuration(Id(800)), revision: R2 })", + "salsa_event(DidReinternValue { key: query_d_arguments(Id(800)), revision: R2 })", "salsa_event(DidValidateMemoizedValue { database_key: query_d(Id(800)) })", "salsa_event(DidValidateMemoizedValue { database_key: query_b(Id(0)) })", - "salsa_event(DidReinternValue { key: Configuration(Id(800)), revision: R2 })", + "salsa_event(DidReinternValue { key: query_d_arguments(Id(800)), revision: R2 })", "salsa_event(DidValidateMemoizedValue { database_key: query_a(Id(0)) })", "salsa_event(DidValidateMemoizedValue { database_key: query_b(Id(0)) })", ]"#]]); @@ -171,7 +171,7 @@ fn revalidate_with_change_after_output_read() { [ "salsa_event(DidSetCancellationFlag)", "salsa_event(DidValidateMemoizedValue { database_key: read_value(Id(403)) })", - "salsa_event(DidReinternValue { key: Configuration(Id(800)), revision: R2 })", + "salsa_event(DidReinternValue { key: query_d_arguments(Id(800)), revision: R2 })", "salsa_event(WillExecute { database_key: query_d(Id(800)) })", "salsa_event(WillExecute { database_key: query_a(Id(0)) })", "salsa_event(DidValidateMemoizedValue { database_key: read_value(Id(400)) })", diff --git a/tests/preverify-struct-with-leaked-data-2.rs b/tests/preverify-struct-with-leaked-data-2.rs index 165407934..a8d770f25 100644 --- a/tests/preverify-struct-with-leaked-data-2.rs +++ b/tests/preverify-struct-with-leaked-data-2.rs @@ -64,7 +64,7 @@ fn test_leaked_inputs_ignored() { [ "WillCheckCancellation", "WillExecute { database_key: function(Id(0)) }", - "DidInternValue { key: Configuration(Id(800)), revision: R1 }", + "DidInternValue { key: counter_field_arguments(Id(800)), revision: R1 }", "WillCheckCancellation", "WillExecute { database_key: counter_field(Id(800)) }", ]"#]]); @@ -83,7 +83,7 @@ fn test_leaked_inputs_ignored() { [ "DidSetCancellationFlag", "WillCheckCancellation", - "DidReinternValue { key: Configuration(Id(800)), revision: R2 }", + "DidReinternValue { key: counter_field_arguments(Id(800)), revision: R2 }", "WillCheckCancellation", "WillExecute { database_key: counter_field(Id(800)) }", "WillExecute { database_key: function(Id(0)) }", From 9213e8441bb773306946123a41c86dae7f738091 Mon Sep 17 00:00:00 2001 From: Micha Reiser Date: Wed, 30 Apr 2025 19:10:43 +0200 Subject: [PATCH 2/2] Change name again --- components/salsa-macro-rules/src/setup_tracked_fn.rs | 2 +- tests/cycle_output.rs | 6 +++--- tests/preverify-struct-with-leaked-data-2.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/salsa-macro-rules/src/setup_tracked_fn.rs b/components/salsa-macro-rules/src/setup_tracked_fn.rs index e27808a1f..87b6fea05 100644 --- a/components/salsa-macro-rules/src/setup_tracked_fn.rs +++ b/components/salsa-macro-rules/src/setup_tracked_fn.rs @@ -139,7 +139,7 @@ macro_rules! setup_tracked_fn { file: file!(), line: line!(), }; - const DEBUG_NAME: &'static str = concat!(stringify!($fn_name), "_arguments"); + const DEBUG_NAME: &'static str = concat!(stringify!($fn_name), "::interned_arguments"); type Fields<$db_lt> = ($($input_ty),*); diff --git a/tests/cycle_output.rs b/tests/cycle_output.rs index 47b3bf038..66b9d566c 100644 --- a/tests/cycle_output.rs +++ b/tests/cycle_output.rs @@ -141,10 +141,10 @@ fn revalidate_no_changes() { [ "salsa_event(DidSetCancellationFlag)", "salsa_event(DidValidateMemoizedValue { database_key: read_value(Id(403)) })", - "salsa_event(DidReinternValue { key: query_d_arguments(Id(800)), revision: R2 })", + "salsa_event(DidReinternValue { key: query_d::interned_arguments(Id(800)), revision: R2 })", "salsa_event(DidValidateMemoizedValue { database_key: query_d(Id(800)) })", "salsa_event(DidValidateMemoizedValue { database_key: query_b(Id(0)) })", - "salsa_event(DidReinternValue { key: query_d_arguments(Id(800)), revision: R2 })", + "salsa_event(DidReinternValue { key: query_d::interned_arguments(Id(800)), revision: R2 })", "salsa_event(DidValidateMemoizedValue { database_key: query_a(Id(0)) })", "salsa_event(DidValidateMemoizedValue { database_key: query_b(Id(0)) })", ]"#]]); @@ -171,7 +171,7 @@ fn revalidate_with_change_after_output_read() { [ "salsa_event(DidSetCancellationFlag)", "salsa_event(DidValidateMemoizedValue { database_key: read_value(Id(403)) })", - "salsa_event(DidReinternValue { key: query_d_arguments(Id(800)), revision: R2 })", + "salsa_event(DidReinternValue { key: query_d::interned_arguments(Id(800)), revision: R2 })", "salsa_event(WillExecute { database_key: query_d(Id(800)) })", "salsa_event(WillExecute { database_key: query_a(Id(0)) })", "salsa_event(DidValidateMemoizedValue { database_key: read_value(Id(400)) })", diff --git a/tests/preverify-struct-with-leaked-data-2.rs b/tests/preverify-struct-with-leaked-data-2.rs index a8d770f25..df3bdf941 100644 --- a/tests/preverify-struct-with-leaked-data-2.rs +++ b/tests/preverify-struct-with-leaked-data-2.rs @@ -64,7 +64,7 @@ fn test_leaked_inputs_ignored() { [ "WillCheckCancellation", "WillExecute { database_key: function(Id(0)) }", - "DidInternValue { key: counter_field_arguments(Id(800)), revision: R1 }", + "DidInternValue { key: counter_field::interned_arguments(Id(800)), revision: R1 }", "WillCheckCancellation", "WillExecute { database_key: counter_field(Id(800)) }", ]"#]]); @@ -83,7 +83,7 @@ fn test_leaked_inputs_ignored() { [ "DidSetCancellationFlag", "WillCheckCancellation", - "DidReinternValue { key: counter_field_arguments(Id(800)), revision: R2 }", + "DidReinternValue { key: counter_field::interned_arguments(Id(800)), revision: R2 }", "WillCheckCancellation", "WillExecute { database_key: counter_field(Id(800)) }", "WillExecute { database_key: function(Id(0)) }",