Merge pull request #532 from salsa-rs/fix-guard-assertion

Fix assertion for same DB in `DbGuard`
salsa-rs · Jul 28, 2024 · b0ee162 · b0ee162
2 parents 8788180 + 354dc0e
commit b0ee162
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/local_state.rs b/src/local_state.rs
@@ -83,12 +83,16 @@ impl LocalState {
         impl<'s> DbGuard<'s> {
             fn new(state: &'s LocalState, db: &dyn Database) -> Self {
                 if let Some(current_db) = state.database.get() {
+                    let new_db = NonNull::from(db);
+
                     // Already attached? Assert that the database has not changed.
-                    assert_eq!(
-                        current_db,
-                        NonNull::from(db),
-                        "cannot change database mid-query",
-                    );
+                    // NOTE: It's important to use `addr_eq` here because `NonNull::eq` not only compares the address but also the type's metadata.
+                    if !std::ptr::addr_eq(current_db.as_ptr(), new_db.as_ptr()) {
+                        panic!(
+                            "Cannot change database mid-query. current: {current_db:?}, new: {new_db:?}",
+                        );
+                    }
+
                     Self { state: None }
                 } else {
                     // Otherwise, set the database.