From c5ea015b57344063000015e7f1e18bf5f14337f3 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Fri, 23 Aug 2024 16:12:24 +0200
Subject: Rule "generic": verify that the output is a properly formed artifact
 stage

---
 src/buildtool/build_engine/target_map/built_in_rules.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/buildtool/build_engine/target_map/built_in_rules.cpp b/src/buildtool/build_engine/target_map/built_in_rules.cpp
index 51664549..94da5991 100644
--- a/src/buildtool/build_engine/target_map/built_in_rules.cpp
+++ b/src/buildtool/build_engine/target_map/built_in_rules.cpp
@@ -1387,13 +1387,21 @@ void GenericRuleWithDeps(
                     action_identifier, std::filesystem::path{path})});
         }
     }
+    auto artifacts_stage = ExpressionPtr{Expression::map_t{artifacts}};
+    auto artifacts_conflict =
+        BuildMaps::Target::Utils::tree_conflict(artifacts_stage);
+    if (artifacts_conflict) {
+        (*logger)(fmt::format("artifacts have staging conflicts on {}",
+                              nlohmann::json(*artifacts_conflict).dump()),
+                  /*fatal=*/true);
+        return;
+    }
 
     auto const& empty_map = Expression::kEmptyMap;
     auto result = std::make_shared<AnalysedTarget const>(
-        TargetResult{
-            .artifact_stage = ExpressionPtr{Expression::map_t{artifacts}},
-            .provides = empty_map,
-            .runfiles = empty_map},
+        TargetResult{.artifact_stage = std::move(artifacts_stage),
+                     .provides = empty_map,
+                     .runfiles = empty_map},
         std::vector<ActionDescription::Ptr>{action},
         std::vector<std::string>{},
         std::move(trees),
-- 
cgit v1.2.3