Miscellneous refactorings of trans #41287
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
eddyb
approved these changes
Apr 13, 2017
| @@ -52,7 +52,6 @@ pub use self::NativeLibraryKind::*; | |||
|
|
|||
| #[derive(Clone, Debug)] | |||
| pub struct LinkMeta { | |||
| pub crate_name: Symbol, | |||
| pub crate_hash: Svh, | |||
| } | |||
There was a problem hiding this comment.
This is one of the weirder structures in the whole compiler and it'd be nice if it'd just die already.
There was a problem hiding this comment.
oh yeah I meant to kill it altogether; it's just a newtype'd svh at this point
There was a problem hiding this comment.
I can do that in a follow-up though
| } | ||
| return metadata; | ||
| return (metadata_llcx, metadata_llmod, metadata); |
There was a problem hiding this comment.
I am surprised we don't have a wrapper for the llcx + llmod combo.
| let (metadata_llcx, metadata_llmod, metadata) = | ||
| time(tcx.sess.time_passes(), "write metadata", || { | ||
| write_metadata(tcx, &link_meta, shared_ccx.exported_symbols()) | ||
| }); | ||
|
|
||
| let metadata_module = ModuleTranslation { | ||
| name: link::METADATA_MODULE_NAME.to_string(), | ||
| symbol_name_hash: 0, // we always rebuild metadata, at least for now | ||
| source: ModuleSource::Translated(ModuleLlvm { |
There was a problem hiding this comment.
ModuleLlvm is what I mean I guess?
| ModuleTranslation { | ||
| name: cgu_name, | ||
| symbol_name_hash, | ||
| source: ModuleSource::Translated(ModuleLlvm { |
There was a problem hiding this comment.
Again, it'd be nice if ccx actually kept a ModuleLlvm.
| pub fn extend(&mut self, stats: Stats) { | ||
| self.n_glues_created.set(self.n_glues_created.get() + stats.n_glues_created.get()); | ||
| self.n_null_glues.set(self.n_null_glues.get() + stats.n_null_glues.get()); | ||
| self.n_real_glues.set(self.n_real_glues.get() + stats.n_real_glues.get()); |
There was a problem hiding this comment.
There's a bunch of stats that are irrelevant anymore AFAIK.
No good reason for them to be in there.
These do some low-level munging on the LLVM data structures. Unclear that they need to operate as a "second pass" but leave it for now.
A number of things were using `crate_hash` that really ought to be using `crate_disambiguator` (e.g., to create the plugin symbol names). They have been updated. It is important to remove `LinkMeta` from `SharedCrateContext` since it contains a hash of the entire crate, and hence it will change whenever **anything** changes (which would then require rebuilding **everything**).
shared mutable state is bad
nikomatsakis
force-pushed
the
incr-comp-refactor-trans
branch
from
d41ce38
to
07fb93e
Compare
|
@bors r+ |
|
📌 Commit 07fb93e has been approved by |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Apr 14, 2017
…ns, r=eddyb Miscellneous refactorings of trans This doesn't achieve any particular goal yet, but it's a collection of refactorings with the common goal of turning `SharedCrateContext` etc into stuff that we can use with on-demand and actually expect to hash in a stable fashion for incremental. Not there yet, clearly. r? @eddyb cc @michaelwoerister
Mark-Simulacrum
added
the
S-waiting-on-bors
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.
This doesn't achieve any particular goal yet, but it's a collection of refactorings with the common goal of turning
SharedCrateContextetc into stuff that we can use with on-demand and actually expect to hash in a stable fashion for incremental. Not there yet, clearly.r? @eddyb
cc @michaelwoerister