libnixt: hack eval cache instead of parse cache (#384)

nix-community · Apr 8, 2024 · 4981a97 · 4981a97
1 parent 8eab44b
commit 4981a97
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/libnixt/include/nixt/HackCache.h b/libnixt/include/nixt/HackCache.h
@@ -1,4 +1,4 @@
-/// Access ParseCache in \p nix::EvalState
+/// Access EvalCache in \p nix::EvalState
 
 #pragma once
 
@@ -7,11 +7,11 @@
 namespace nixt {
 
 #if HAVE_BOEHMGC
-using FileParseCache = std::map<
-    nix::SourcePath, nix::Expr *, std::less<nix::SourcePath>,
-    traceable_allocator<std::pair<const nix::SourcePath, nix::Expr *>>>;
+using FileEvalCache =
+    std::map<nix::SourcePath, nix::Value, std::less<nix::SourcePath>,
+             traceable_allocator<std::pair<const nix::SourcePath, nix::Value>>>;
 #else
-using FileParseCache = std::map<nix::SourcePath, nix::Expr *>;
+using FileEvalCache = std::map<nix::SourcePath, nix::Expr *>;
 #endif
 
 namespace detail {
@@ -35,16 +35,16 @@ typename RB<Tag, p>::F RB<Tag, p>::FO;
 
 // Impl
 
-struct ParseCacheF {
-  using type = FileParseCache nix::EvalState::*;
+struct EvalCacheF {
+  using type = FileEvalCache nix::EvalState::*;
 };
 
-template struct RB<ParseCacheF, &nix::EvalState::fileParseCache>;
+template struct RB<EvalCacheF, &nix::EvalState::fileEvalCache>;
 
 } // namespace detail
 
-inline FileParseCache &getFileParseCache(nix::EvalState &S) {
-  return S.*detail::R<detail::ParseCacheF>::P;
+inline FileEvalCache &getFileEvalCache(nix::EvalState &S) {
+  return S.*detail::R<detail::EvalCacheF>::P;
 }
 
 } // namespace nixt
diff --git a/nixd/nix-node-eval/src/EvalProvider.cpp b/nixd/nix-node-eval/src/EvalProvider.cpp
@@ -63,8 +63,8 @@ void EvalProvider::onRegisterBC(const rpc::RegisterBCParams &Params) {
   State->eval(AST, V);
 
   // Inject pre-parsed AST into EvalState cache
-  auto Cache = nixt::getFileParseCache(*State);
-  Cache[CachePath] = AST;
+  auto &Cache = nixt::getFileEvalCache(*State);
+  Cache[CachePath] = V;
 }
 
 void EvalProvider::onExprValue(const ExprValueParams &Params,