From d78bdd2f7143da31087c3ab88298b52defb90fdc Mon Sep 17 00:00:00 2001
From: Googler <gregce@google.com>
Date: Thu, 2 Nov 2023 15:35:07 -0700
Subject: [PATCH] Temporarily disable `BaselineOptionsFunction` + Starlark exec
 transition.

Downstream testing shows a not-yet-diagnosed correctness problem.

PiperOrigin-RevId: 578998938
Change-Id: Ic22725f97a7a1f9bb2be22f4cf63b47bad822b13
---
 .../build/lib/skyframe/config/BaselineOptionsFunction.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/config/BaselineOptionsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/config/BaselineOptionsFunction.java
index b1ec3230afdd97..2e91743da3b93e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/config/BaselineOptionsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/config/BaselineOptionsFunction.java
@@ -90,7 +90,9 @@ public SkyValue compute(SkyKey skyKey, Environment env)
                               ? key.newPlatform()
                               : Label.parseCanonicalUnchecked(
                                   "//this_is_a_faked_exec_platform_for_blaze_internals"))
-                      .analysisData(starlarkExecTransition.orElse(null))
+                      // TODO(b/309007312): Uncomment below to re-enable the Starlark exec
+                      // transition.
+                      // .analysisData(starlarkExecTransition.orElse(null))
                       .build());
       adjustedBaselineOptions =
           execTransition.patch(