Merge pull request #730 from Veykril/veykril/push-orlktsrpwzrv

Don't load `verified_at` twice in `shallow_verify_memo`

src/function/maybe_changed_after.rs

@@ -139,7 +139,15 @@ where
             return true;
         }
 
-        if memo.check_durability(zalsa) {
+        let last_changed = zalsa.last_changed_revision(memo.revisions.durability);
+        tracing::debug!(
+            "{database_key_index:?}: check_durability(memo = {memo:#?}, last_changed={:?} <= verified_at={:?}) = {:?}",
+            last_changed,
+            verified_at,
+            last_changed <= verified_at,
+            memo = memo.tracing_debug()
+        );
+        if last_changed <= verified_at {
             // No input of the suitable durability has changed since last verified.
             let db = db.as_dyn_database();
             memo.mark_as_verified(

src/function/memo.rs

@@ -154,18 +154,6 @@ impl<V> Memo<V> {
             revisions,
         }
     }
-    /// True if this memo is known not to have changed based on its durability.
-    pub(super) fn check_durability(&self, zalsa: &Zalsa) -> bool {
-        let last_changed = zalsa.last_changed_revision(self.revisions.durability);
-        let verified_at = self.verified_at.load();
-        tracing::debug!(
-            "check_durability(last_changed={:?} <= verified_at={:?}) = {:?}",
-            last_changed,
-            self.verified_at,
-            last_changed <= verified_at,
-        );
-        last_changed <= verified_at
-    }
 
     /// Mark memo as having been verified in the `revision_now`, which should
     /// be the current revision.