Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Switch CrateMetadata's source_map_import_info from RwLock to Once #65979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 31, 2019
Merged

Switch CrateMetadata's source_map_import_info from RwLock to Once #65979

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
308c4a6
Correctly indent get_predicates function
spastorino Oct 30, 2019
a6ac22e
Change CrateMetadata's source_map_import_info from RwLock to Once
spastorino Oct 30, 2019
12273cb
Make init_locking return a reference to the initialized data
spastorino Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make init_locking return a reference to the initialized data
  • Loading branch information
@spastorino
spastorino committed Oct 30, 2019
commit 12273cb7f66f463683ad4d6c54b17afe0b7d8422
14 changes: 8 additions & 6 deletions src/librustc_data_structures/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,13 +497,15 @@ impl<T> Once<T> {
/// If the value was already initialized the closure is not called and `false` is returned,
/// otherwise if the value from the closure initializes the inner value, `true` is returned
#[inline]
pub fn init_locking<F: FnOnce() -> T>(&self, f: F) -> bool {
let mut lock = self.0.lock();
if lock.is_some() {
return false;
pub fn init_locking<F: FnOnce() -> T>(&self, f: F) -> &T {
{
let mut lock = self.0.lock();
if lock.is_none() {
*lock = Some(f());
}
}
*lock = Some(f());
true

self.borrow()
}

/// Tries to initialize the inner value by calling the closure without ensuring that no-one
Expand Down
4 changes: 1 addition & 3 deletions src/librustc_metadata/decoder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,9 +1351,7 @@ impl<'a, 'tcx> CrateMetadata {
translated_source_file: local_version,
}
}).collect()
});

self.source_map_import_info.borrow()
})
}

/// Get the `DepNodeIndex` corresponding this crate. The result of this
Expand Down