Use a dummy toolchain context for rules that don't have one. #13162
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brandjon
approved these changes
Mar 5, 2021
| @@ -2034,6 +2034,35 @@ EOF | |||
| expect_not_log "does not provide ToolchainTypeInfo" | |||
| } | |||
|
|
|||
| function test_toolchain_from_no_toolchain_rule() { | |||
| # Create a build_setting that tries to load a toolchain. | |||
| # build_settings cnanot actually have toolchains because they | |||
| cat >> demo/rule.bzl <<EOF | ||
| def _sample_impl(ctx): | ||
| info = ctx.toolchains["//:toolchain_type"] | ||
| if info: |
There was a problem hiding this comment.
if info != None:? To distinguish from other false-y values.
| @@ -2034,6 +2034,35 @@ EOF | |||
| expect_not_log "does not provide ToolchainTypeInfo" | |||
| } | |||
|
|
|||
| function test_toolchain_from_no_toolchain_rule() { | |||
There was a problem hiding this comment.
What's the purpose of testing this at both the unit test and shell test levels?
There was a problem hiding this comment.
Good point, I wrote this first then added the other to debug, but we only need one. Removed the shell test.
| // Starlark rules are easier if this cannot be null, so return a no-op value instead. | ||
| return new ToolchainContextApi() { | ||
| @Override | ||
| public Object getIndex(StarlarkSemantics semantics, Object key) throws EvalException { |
There was a problem hiding this comment.
Nit: You can omit the throws declaration since this override doesn't throw. Same below.
| ResolvedToolchainContext toolchainContext = ruleContext.getToolchainContext(); | ||
| if (toolchainContext == null) { | ||
| // Starlark rules are easier if this cannot be null, so return a no-op value instead. | ||
| return new ToolchainContextApi() { |
There was a problem hiding this comment.
Optionally make this a singleton, but I doubt it'll matter much.
There was a problem hiding this comment.
I don't think there's enough benefit, this is fairly clear.
katre
added a commit
to katre/bazel
that referenced
this pull request
Jul 13, 2021
Fixes bazelbuild#12610. Closes bazelbuild#13162. PiperOrigin-RevId: 361545255
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12610.