PassWrapper: update for llvm/llvm-project@a3319371970b #122143
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
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
@rustbot label: +llvm-main
durin42
force-pushed
the
llvm-19-compression-options
branch
from
886a109 to
ef626d7
Compare
Comment on lines
453
to
+477
| if (!strcmp("zlib", DebugInfoCompression) && llvm::compression::zlib::isAvailable()) { | ||
| #if LLVM_VERSION_GE(19, 0) | ||
| Options.MCOptions.CompressDebugSections = DebugCompressionType::Zlib; | ||
| #else | ||
| Options.CompressDebugSections = DebugCompressionType::Zlib; | ||
| #endif | ||
| } else if (!strcmp("zstd", DebugInfoCompression) && llvm::compression::zstd::isAvailable()) { | ||
| #if LLVM_VERSION_GE(19, 0) | ||
| Options.MCOptions.CompressDebugSections = DebugCompressionType::Zstd; | ||
| #else | ||
| Options.CompressDebugSections = DebugCompressionType::Zstd; | ||
| #endif | ||
| } else if (!strcmp("none", DebugInfoCompression)) { | ||
| #if LLVM_VERSION_GE(19, 0) | ||
| Options.MCOptions.CompressDebugSections = DebugCompressionType::None; | ||
| #else | ||
| Options.CompressDebugSections = DebugCompressionType::None; | ||
| #endif | ||
| } | ||
|
|
||
| #if LLVM_VERSION_GE(19, 0) | ||
| Options.MCOptions.X86RelaxRelocations = RelaxELFRelocations; | ||
| #else | ||
| Options.RelaxELFRelocations = RelaxELFRelocations; | ||
| #endif |
There was a problem hiding this comment.
I'm not deeply familiar with C++, but is it possible to use the pattern of
#if LLVM_VERSION_GE(19,0)
DebugCompressionType& compress_debug_sections = &Options.MCOptions.CompressDebugSections;
#else
DebugCompressionType& compress_debug_sections = &Options.CompressDebugSections;
#endif
if (!strcmp("zlib", DebugInfoCompression) && llvm::compression::zlib::isAvailable()) {
compress_debug_sections = DebugCompressionType::Zlib;
} elseetc.
to reduce the repeated nesting?
There was a problem hiding this comment.
It....might be, but I'd have to think hard about it. It's readable to my brain to not have the indirection of the reference in the C++, so I think I'd rather leave it as-is.
There was a problem hiding this comment.
That's fine then. I find the current form a little challenging to read but I agree that it's closer to a wash.
There was a problem hiding this comment.
Another way to approach that is to assign the desired DebugCompressionType to a local and then have one conditional assignment block.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 8, 2024
…s, r=workingjubilee PassWrapper: update for llvm/llvm-project@a3319371970b `@rustbot` label: +llvm-main
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 8, 2024
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#118623 (Improve std::fs::read_to_string example) - rust-lang#119365 (Add asm goto support to `asm!`) - rust-lang#120608 (Docs for std::ptr::slice_from_raw_parts) - rust-lang#121885 (Move generic `NonZero` `rustc_layout_scalar_valid_range_start` attribute to inner type.) - rust-lang#121938 (Fix quadratic behavior of repeated vectored writes) - rust-lang#122099 (Add `#[inline]` to `BTreeMap::new` constructor) - rust-lang#122143 (PassWrapper: update for llvm/llvm-project@a3319371970b) Failed merges: - rust-lang#122076 (Tweak the way we protect in-place function arguments in interpreters) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 8, 2024
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#118623 (Improve std::fs::read_to_string example) - rust-lang#119365 (Add asm goto support to `asm!`) - rust-lang#120608 (Docs for std::ptr::slice_from_raw_parts) - rust-lang#121832 (Add new Tier-3 target: `loongarch64-unknown-linux-musl`) - rust-lang#121938 (Fix quadratic behavior of repeated vectored writes) - rust-lang#122099 (Add `#[inline]` to `BTreeMap::new` constructor) - rust-lang#122103 (Make TAITs and ATPITs capture late-bound lifetimes in scope) - rust-lang#122143 (PassWrapper: update for llvm/llvm-project@a3319371970b) Failed merges: - rust-lang#122076 (Tweak the way we protect in-place function arguments in interpreters) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 8, 2024
Rollup merge of rust-lang#122143 - durin42:llvm-19-compression-options, r=workingjubilee PassWrapper: update for llvm/llvm-project@a3319371970b ``@rustbot`` label: +llvm-main
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.
@rustbot label: +llvm-main