Clean up ModuleConfig initialization
#70644
Merged
Conversation
This file contains hidden or 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
rust-highfive
added
the
S-waiting-on-review
The condition checks if `sess.opts.output_types` doesn't contain `OutputType::Assembly` within a match arm that is only reached if `sess.opts.output_types` contains `OutputType::Assembly`.
|
The middle commit is difficult to review, apologies for that. Note that the old |
There are three `ModuleConfigs`, one for each `ModuleKind`. The code to initialized them is spaghetti imperative code that sets each field to a default value and then modifies many fields in complicated ways. This makes it very hard to tell what value ends up in each field in each config. For example, the `modules_config.emit_pre_lto_bc` field is set twice, which means it can be set to true and then incorrectly set back to false. (This probably hasn't been noticed because it happens in a very obscure case.) This commit changes the code to a declarative style in which `ModuleConfig::new` initializes all fields and then they are never changed again. This is slightly more concise and much easier to read. (And it fixes the abovementioned `emit_pre_lto_bc` error as well.)
That way it matches `ModuleKind::Regular`.
nnethercote
force-pushed
the
clean-up-ModuleConfig-init
branch
from
b1ec6ab to
5131c69
Compare
joelpalmer
added
S-waiting-on-review
|
@bors r+ Thanks! The code is much better now, even if still a bit confusing, but I think that's fairly unavoidable for this sort of thing. |
|
📌 Commit 5131c69 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Apr 11, 2020
…nit, r=Mark-Simulacrum Clean up `ModuleConfig` initialization Because it's currently a mess. r? @Mark-Simulacrum
|
⌛ Testing commit 5131c69 with merge 071b3426de7f4a0c693aca72266c4ebcdbfcecdd... |
|
@bors retry yield |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 11, 2020
Rollup of 5 pull requests Successful merges: - rust-lang#70644 (Clean up `ModuleConfig` initialization) - rust-lang#70937 (Fix staticlib name for *-pc-windows-gnu targets) - rust-lang#70996 (Add or_insert_with_key to Entry of HashMap/BTreeMap) - rust-lang#71020 (Store UNICODE_VERSION as a tuple) - rust-lang#71021 (Use write!-style syntax for MIR assert terminator) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Because it's currently a mess.
r? @Mark-Simulacrum