[6.5.0] Fix bootstrapped Bazel binary #20804
Merged
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
For the bootstrap VanillaJavaBuilder, it is important that the AutoValue plugin classes do not end up in the deploy jar. If they do, the processor class is loaded from the app classloader (instead of the processor path classloader). When this happens, AutoValueProcessor uses the app classloader to load extensions (such as auto-value-gson needed by bzlmod), instead of the processor path classloader. Unless all extensions are also correctly present in the app classloder (i.e. in the VanillaJavaBuilder deploy jar), they won't be loaded. Unfortunately, simply adding the jars to the deploy jar is insufficient, we need to also correctly merge the `META-INF/service/...` files as well, which does not happen in our bootstrap java_binary/java_library rules. So, to fix, we remove the auto value plugins from the deploy jar, and use them only to compile our sources that require them. Added a regression test for the crash. We should probably improve it so that we can actually build with the bootstapped Bazel in tests without network access. But I don't think we need block this patch release on that. Fixes bazelbuild#20501 PiperOrigin-RevId: 592266992 Change-Id: I08ac91ee74140df0c4f22ad2553a8c017b497181
hvadehra
approved these changes
Jan 9, 2024
iancha1992
pushed a commit
that referenced
this pull request
Jan 23, 2024
Baseline: 50b61e3 Release Notes: + Fix tree file materialized as symlink to another file when building without the bytes. (#20409) + Don't pass --add-opens= to javac (#20472) + Flip --incompatible_visibility_private_attributes_at_definition (#20520) + Fix extraction of tar archives containing sparse files. (#20531) + RemoteSpawnRunner: record inbetween phases in timing profile (#20550) + Add profiling to `remoteActionBuildingSemaphore.acquire()` (#20549) + The label API shakeup & docs cleanup (#20590) + Disable rewriter test (#20758) + Disable PyTest.testSmoke on macOS (#20729) + Upgrade abseil-cpp to fix build on macos_arm64 (#20785) + Ignore read-only errors when updating the `mtime` of the `install_base` (#20568) + Restart at most once when prepopulating repository rule environment (#20667) + Fix bootstrapped Bazel binary (#20804) + Add flag `experimental_throttle_remote_action_building` (#20861) + Fix versioned shared libraries for macOS toolchain (#20847) + Proto toolchainisation cherrypicks (#20925) Acknowledgements: This release contains contributions from many people at Google, as well as bazel.build machine account, Brentley Jones, Fabian Meumertzheim, Jordan Mele, Mai Hussien, oquenchil, Rahul Butani, Son Luong Ngoc, Xùdōng Yáng.
copybara-service bot
pushed a commit
that referenced
this pull request
Jan 23, 2024
Baseline: 50b61e3 Release Notes: + Fix tree file materialized as symlink to another file when building without the bytes. (#20409) + Don't pass --add-opens= to javac (#20472) + Flip --incompatible_visibility_private_attributes_at_definition (#20520) + Fix extraction of tar archives containing sparse files. (#20531) + RemoteSpawnRunner: record inbetween phases in timing profile (#20550) + Add profiling to `remoteActionBuildingSemaphore.acquire()` (#20549) + The label API shakeup & docs cleanup (#20590) + Disable rewriter test (#20758) + Disable PyTest.testSmoke on macOS (#20729) + Upgrade abseil-cpp to fix build on macos_arm64 (#20785) + Ignore read-only errors when updating the `mtime` of the `install_base` (#20568) + Restart at most once when prepopulating repository rule environment (#20667) + Fix bootstrapped Bazel binary (#20804) + Add flag `experimental_throttle_remote_action_building` (#20861) + Fix versioned shared libraries for macOS toolchain (#20847) + Proto toolchainisation cherrypicks (#20925) Acknowledgements: This release contains contributions from many people at Google, as well as bazel.build machine account, Brentley Jones, Fabian Meumertzheim, Jordan Mele, Mai Hussien, oquenchil, Rahul Butani, Son Luong Ngoc, Xùdōng Yáng.
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.
For the bootstrap VanillaJavaBuilder, it is important that the AutoValue plugin classes do not end up in the deploy jar. If they do, the processor class is loaded from the app classloader (instead of the processor path classloader). When this happens, AutoValueProcessor uses the app classloader to load extensions (such as auto-value-gson needed by bzlmod), instead of the processor path classloader. Unless all extensions are also correctly present in the app classloder (i.e. in the VanillaJavaBuilder deploy jar), they won't be loaded.
Unfortunately, simply adding the jars to the deploy jar is insufficient, we need to also correctly merge the
META-INF/service/...files as well, which does not happen in our bootstrap java_binary/java_library rules. So, to fix, we remove the auto value plugins from the deploy jar, and use them only to compile our sources that require them.Added a regression test for the crash. We should probably improve it so that we can actually build with the bootstapped Bazel in tests without network access. But I don't think we need block this patch release on that.
Fixes #20501
PiperOrigin-RevId: 592266992
Change-Id: I08ac91ee74140df0c4f22ad2553a8c017b497181