mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compute address space from previous file.

Browse Source
This commit is contained in:
Camille GILLOT 2023-09-03 12:51:15 +00:00
parent 548ba13265
commit 4a87a44451
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
compiler/rustc_span/src/source_map.rs
View File

@ -14,13 +14,10 @@ pub use crate::*;
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::stable_hasher::{Hash128, Hash64, StableHasher}; use rustc_data_structures::stable_hasher::{Hash128, Hash64, StableHasher};
use rustc_data_structures::sync::{ use rustc_data_structures::sync::{IntoDynSyncSend, Lrc, MappedReadGuard, ReadGuard, RwLock};
AtomicU32, IntoDynSyncSend, Lrc, MappedReadGuard, ReadGuard, RwLock,
};
use std::cmp; use std::cmp;
use std::hash::Hash; use std::hash::Hash;
use std::path::{self, Path, PathBuf}; use std::path::{self, Path, PathBuf};
use std::sync::atomic::Ordering;
use std::fs; use std::fs;
use std::io; use std::io;
@ -187,9 +184,6 @@ pub(super) struct SourceMapFiles {
} }
pub struct SourceMap { pub struct SourceMap {
/// The address space below this value is currently used by the files in the source map.
used_address_space: AtomicU32,
files: RwLock<SourceMapFiles>, files: RwLock<SourceMapFiles>,
file_loader: IntoDynSyncSend<Box<dyn FileLoader + Sync + Send>>, file_loader: IntoDynSyncSend<Box<dyn FileLoader + Sync + Send>>,
// This is used to apply the file path remapping as specified via // This is used to apply the file path remapping as specified via
@ -215,7 +209,6 @@ impl SourceMap {
hash_kind: SourceFileHashAlgorithm, hash_kind: SourceFileHashAlgorithm,
) -> SourceMap { ) -> SourceMap {
SourceMap { SourceMap {
used_address_space: AtomicU32::new(0),
files: Default::default(), files: Default::default(),
file_loader: IntoDynSyncSend(file_loader), file_loader: IntoDynSyncSend(file_loader),
path_mapping, path_mapping,
@ -271,31 +264,18 @@ impl SourceMap {
&self, &self,
mut file: SourceFile, mut file: SourceFile,
) -> Result<Lrc<SourceFile>, OffsetOverflowError> { ) -> Result<Lrc<SourceFile>, OffsetOverflowError> {
let size = file.source_len.to_u32();
let start_pos = loop {
let current = self.used_address_space.load(Ordering::Relaxed);
let next = current
.checked_add(size)
// Add one so there is some space between files. This lets us distinguish
// positions in the `SourceMap`, even in the presence of zero-length files.
.and_then(|next| next.checked_add(1))
.ok_or(OffsetOverflowError)?;
if self
.used_address_space
.compare_exchange(current, next, Ordering::Relaxed, Ordering::Relaxed)
.is_ok()
{
break usize::try_from(current).unwrap();
}
};
file.start_pos = BytePos::from_usize(start_pos);
let file_id = StableSourceFileId::new(&file); let file_id = StableSourceFileId::new(&file);
let mut files = self.files.borrow_mut(); let mut files = self.files.borrow_mut();
file.start_pos = BytePos(if let Some(last_file) = files.source_files.last() {
// Add one so there is some space between files. This lets us distinguish
// positions in the `SourceMap`, even in the presence of zero-length files.
last_file.end_position().0.checked_add(1).ok_or(OffsetOverflowError)?
} else {
0
});
let file = Lrc::new(file); let file = Lrc::new(file);
files.source_files.push(file.clone()); files.source_files.push(file.clone());
files.stable_id_to_source_file.insert(file_id, file.clone()); files.stable_id_to_source_file.insert(file_id, file.clone());