Skip to content

[9.3.0] Don't crash when a module file's state is dropped mid-computation (https://github.com/bazelbuild/bazel/pull/30756) #30809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bazel-io wants to merge 1 commit into
base: release-9.3.0
Choose a base branch
from
+3 −3
Open

[9.3.0] Don't crash when a module file's state is dropped mid-computation (https://github.com/bazelbuild/bazel/pull/30756) #30809

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
} else {
moduleThreadContext =
execNonRegistryModuleFile(
moduleKey, starlarkSemantics, env, SymbolGenerator.create(skyKey));
moduleKey, state, starlarkSemantics, env, SymbolGenerator.create(skyKey));
if (moduleThreadContext == null) {
return null;
}
Expand Down Expand Up @@ -319,7 +319,7 @@ private SkyValue computeForRootModule(
}
}
var moduleThreadContext =
execNonRegistryModuleFile(ModuleKey.ROOT, starlarkSemantics, env, symbolGenerator);
execNonRegistryModuleFile(ModuleKey.ROOT, state, starlarkSemantics, env, symbolGenerator);
if (moduleThreadContext == null) {
return null;
}
Expand All @@ -334,11 +334,11 @@ private SkyValue computeForRootModule(
@Nullable
private ModuleThreadContext execNonRegistryModuleFile(
ModuleKey moduleKey,
State state,
StarlarkSemantics starlarkSemantics,
Environment env,
SymbolGenerator<?> symbolGenerator)
throws ModuleFileFunctionException, InterruptedException {
var state = env.getState(State::new);
Preconditions.checkNotNull(state.compiledModuleFile);
if (state.horizon == null) {
state.horizon = state.compiledModuleFile.includeStatements();
Expand Down