Remove dep on ExecutionPlatformConstraints from buck2_bxl

Summary: For D63929039.

Reviewed By: JakobDegen

Differential Revision: D63929038

fbshipit-source-id: 7f04253a907ce3f5b6d2ef15fed89573f31a3d3b

Author: stepancheg

app/buck2_bxl/src/bxl/starlark_defs/context/actions.rs

@@ -16,7 +16,6 @@ use buck2_build_api::analysis::registry::AnalysisRegistry;
 use buck2_build_api::interpreter::rule_defs::context::AnalysisActions;
 use buck2_build_api::interpreter::rule_defs::provider::dependency::Dependency;
 use buck2_configured::configuration::calculation::ConfigurationCalculation;
-use buck2_configured::nodes::calculation::ExecutionPlatformConstraints;
 use buck2_core::cells::name::CellName;
 use buck2_core::configuration::data::ConfigurationData;
 use buck2_core::configuration::pair::ConfigurationNoExec;
@@ -29,6 +28,7 @@ use buck2_interpreter::types::configured_providers_label::StarlarkProvidersLabel
 use buck2_node::attrs::configuration_context::AttrConfigurationContext;
 use buck2_node::attrs::configuration_context::AttrConfigurationContextImpl;
 use buck2_node::configuration::resolved::ConfigurationSettingKey;
+use buck2_node::execution::GET_EXECUTION_PLATFORMS;
 use derivative::Derivative;
 use derive_more::Display;
 use dice::DiceComputations;
@@ -107,19 +107,22 @@ pub(crate) async fn resolve_bxl_execution_platform(
         .map(|t| configuration_ctx.configure_toolchain_target(t))
         .collect();
 
-    let execution_constraints = ExecutionPlatformConstraints::new_constraints(
-        exec_deps
-            .iter()
-            .map(|label| label.target().dupe())
-            .collect(),
-        toolchain_deps_configured
-            .iter()
-            .map(|dep| TargetConfiguredTargetLabel::new_without_exec_cfg(dep.target().dupe()))
-            .collect(),
-        exec_compatible_with,
-    );
-
-    let resolved_execution = execution_constraints.one_for_cell(ctx, cell).await?;
+    let resolved_execution = GET_EXECUTION_PLATFORMS
+        .get()?
+        .execution_platform_resolution_one_for_cell(
+            ctx,
+            exec_deps
+                .iter()
+                .map(|label| label.target().dupe())
+                .collect(),
+            toolchain_deps_configured
+                .iter()
+                .map(|dep| TargetConfiguredTargetLabel::new_without_exec_cfg(dep.target().dupe()))
+                .collect(),
+            exec_compatible_with,
+            cell,
+        )
+        .await?;
 
     let exec_deps_configured = exec_deps.try_map(|e| {
         let label =

app/buck2_configured/src/configuration/calculation.rs

@@ -49,7 +49,9 @@ use buck2_build_api::analysis::calculation::RuleAnalysisCalculation;
 use buck2_build_api::interpreter::rule_defs::provider::builtin::configuration_info::FrozenConfigurationInfo;
 use buck2_build_api::interpreter::rule_defs::provider::builtin::execution_platform_registration_info::FrozenExecutionPlatformRegistrationInfo;
 use buck2_common::legacy_configs::key::BuckconfigKeyRef;
+use buck2_core::target::target_configured_target_label::TargetConfiguredTargetLabel;
 use buck2_node::execution::{GetExecutionPlatformsImpl, GET_EXECUTION_PLATFORMS, GetExecutionPlatforms, EXECUTION_PLATFORMS_BUCKCONFIG};
+use crate::nodes::calculation::ExecutionPlatformConstraints;
 
 #[derive(Debug, buck2_error::Error)]
 #[buck2(input)]
@@ -759,6 +761,23 @@ impl GetExecutionPlatformsImpl for GetExecutionPlatformsInstance {
     ) -> buck2_error::Result<Option<ExecutionPlatforms>> {
         ctx.compute(&ExecutionPlatformsKey).await?
     }
+
+    async fn execution_platform_resolution_one_for_cell(
+        &self,
+        dice: &mut DiceComputations<'_>,
+        exec_deps: Arc<[TargetLabel]>,
+        toolchain_deps: Arc<[TargetConfiguredTargetLabel]>,
+        exec_compatible_with: Arc<[ConfigurationSettingKey]>,
+        cell: CellName,
+    ) -> buck2_error::Result<ExecutionPlatformResolution> {
+        ExecutionPlatformConstraints::new_constraints(
+            exec_deps,
+            toolchain_deps,
+            exec_compatible_with,
+        )
+        .one_for_cell(dice, cell)
+        .await
+    }
 }
 
 pub(crate) fn init_get_execution_platforms() {

app/buck2_configured/src/nodes/calculation.rs

@@ -196,14 +196,14 @@ pub async fn find_execution_platform_by_configuration(
     }
 }
 
-pub struct ExecutionPlatformConstraints {
+pub(crate) struct ExecutionPlatformConstraints {
     exec_deps: Arc<[TargetLabel]>,
     toolchain_deps: Arc<[TargetConfiguredTargetLabel]>,
     exec_compatible_with: Arc<[ConfigurationSettingKey]>,
 }
 
 impl ExecutionPlatformConstraints {
-    pub fn new_constraints(
+    pub(crate) fn new_constraints(
         exec_deps: Arc<[TargetLabel]>,
         toolchain_deps: Arc<[TargetConfiguredTargetLabel]>,
         exec_compatible_with: Arc<[ConfigurationSettingKey]>,
@@ -285,7 +285,7 @@ impl ExecutionPlatformConstraints {
         .await
     }
 
-    pub async fn one_for_cell(
+    pub(crate) async fn one_for_cell(
         self,
         ctx: &mut DiceComputations<'_>,
         cell: CellName,

app/buck2_node/src/execution.rs

@@ -7,12 +7,20 @@
  * of this source tree.
  */
 
+use std::sync::Arc;
+
 use async_trait::async_trait;
 use buck2_common::legacy_configs::key::BuckconfigKeyRef;
+use buck2_core::cells::name::CellName;
+use buck2_core::execution_types::execution::ExecutionPlatformResolution;
 use buck2_core::execution_types::execution_platforms::ExecutionPlatforms;
+use buck2_core::target::label::label::TargetLabel;
+use buck2_core::target::target_configured_target_label::TargetConfiguredTargetLabel;
 use buck2_util::late_binding::LateBinding;
 use dice::DiceComputations;
 
+use crate::configuration::resolved::ConfigurationSettingKey;
+
 pub const EXECUTION_PLATFORMS_BUCKCONFIG: BuckconfigKeyRef = BuckconfigKeyRef {
     section: "build",
     property: "execution_platforms",
@@ -24,6 +32,15 @@ pub trait GetExecutionPlatformsImpl: 'static + Send + Sync {
         &self,
         dice_computations: &mut DiceComputations<'_>,
     ) -> buck2_error::Result<Option<ExecutionPlatforms>>;
+
+    async fn execution_platform_resolution_one_for_cell(
+        &self,
+        dice: &mut DiceComputations<'_>,
+        exec_deps: Arc<[TargetLabel]>,
+        toolchain_deps: Arc<[TargetConfiguredTargetLabel]>,
+        exec_compatible_with: Arc<[ConfigurationSettingKey]>,
+        cell: CellName,
+    ) -> buck2_error::Result<ExecutionPlatformResolution>;
 }
 
 pub static GET_EXECUTION_PLATFORMS: LateBinding<&'static dyn GetExecutionPlatformsImpl> =