Return ResultTargetMap from analysis

...instead of filling in a map passed from the outside.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/buildtool/main/diagnose.cpp b/src/buildtool/main/diagnose.cpp
index 8cc198d9..9e67551f 100644
--- a/src/buildtool/main/diagnose.cpp
+++ b/src/buildtool/main/diagnose.cpp
@@ -37,6 +37,7 @@
 #include "src/buildtool/build_engine/expression/expression_ptr.hpp"
 #include "src/buildtool/build_engine/expression/target_result.hpp"
 #include "src/buildtool/build_engine/target_map/configured_target.hpp"
+#include "src/buildtool/build_engine/target_map/result_map.hpp"
 #include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/logging/logger.hpp"
 #include "src/utils/cpp/json.hpp"
@@ -325,7 +326,6 @@ void DumpResult(std::string const& file_path, AnalysisResult const& result) {
 }  // namespace
 
 void DiagnoseResults(AnalysisResult const& result,
-                     BuildMaps::Target::ResultTargetMap const& result_map,
                      DiagnosticArguments const& clargs) {
     Logger::Log(
         LogLevel::Info,
@@ -358,14 +358,16 @@ void DiagnoseResults(AnalysisResult const& result,
         DumpVars(*clargs.dump_vars, result);
     }
     if (clargs.dump_targets) {
-        DumpTargets(*clargs.dump_targets, result_map.ConfiguredTargets());
+        DumpTargets(*clargs.dump_targets,
+                    result.result_map.ConfiguredTargets());
     }
     if (clargs.dump_export_targets) {
-        DumpTargets(
-            *clargs.dump_export_targets, result_map.ExportTargets(), "export ");
+        DumpTargets(*clargs.dump_export_targets,
+                    result.result_map.ExportTargets(),
+                    "export ");
     }
     if (clargs.dump_targets_graph) {
-        auto graph = result_map.ConfiguredTargetsGraph().dump(2);
+        auto graph = result.result_map.ConfiguredTargetsGraph().dump(2);
         Logger::Log(LogLevel::Info,
                     "Dumping graph of configured-targets to file {}.",
                     *clargs.dump_targets_graph);
@@ -373,7 +375,8 @@ void DiagnoseResults(AnalysisResult const& result,
         os << graph << std::endl;
     }
     if (clargs.dump_anonymous) {
-        DumpAnonymous(*clargs.dump_anonymous, result_map.ConfiguredTargets());
+        DumpAnonymous(*clargs.dump_anonymous,
+                      result.result_map.ConfiguredTargets());
     }
     if (clargs.dump_nodes) {
         DumpNodes(*clargs.dump_nodes, result);