From 427b6e4e83486858b1ab160c75e2754ba173eebe Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Thu, 4 Apr 2024 10:13:17 +0200
Subject: Evaluator: Add infrastructure to annotate relevant objects

... which are, in particular, artifacts involved in staging conflicts.
While there, also make disjoint union honor the expression log limit.
---
 src/buildtool/build_engine/expression/expression_ptr.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/buildtool/build_engine/expression/expression_ptr.cpp')

diff --git a/src/buildtool/build_engine/expression/expression_ptr.cpp b/src/buildtool/build_engine/expression/expression_ptr.cpp
index 368d2816..68b45c6f 100644
--- a/src/buildtool/build_engine/expression/expression_ptr.cpp
+++ b/src/buildtool/build_engine/expression/expression_ptr.cpp
@@ -60,10 +60,12 @@ auto ExpressionPtr::Evaluate(
     Configuration const& env,
     FunctionMapPtr const& functions,
     std::function<void(std::string const&)> const& logger,
-    std::function<void(void)> const& note_user_context) const noexcept
-    -> ExpressionPtr {
+    std::function<std::string(ExpressionPtr)> const& annotate_object,
+    std::function<void(void)> const& note_user_context
+
+) const noexcept -> ExpressionPtr {
     return Evaluator::EvaluateExpression(
-        *this, env, functions, logger, note_user_context);
+        *this, env, functions, logger, annotate_object, note_user_context);
 }
 
 auto ExpressionPtr::IsCacheable() const noexcept -> bool {
-- 
cgit v1.2.3