Skip to content

fix: caches of emit module in str_impl may be invalid #1112

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
sorrycc merged 1 commit into from
May 6, 2024
Merged

fix: caches of emit module in str_impl may be invalid #1112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions crates/mako/src/generate/chunk_pot/str_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,13 @@ type EmittedWithMapping = (String, Option<Vec<(BytePos, LineCol)>>);
key = "String",
type = "SizedCache<String , EmittedWithMapping>",
create = "{ SizedCache::with_size(20000) }",
convert = r#"{format!("{}-{}", _raw_hash, module_id)}"#
convert = r#"{format!("{}-{}-{}", _chunk_id, _raw_hash, module_id)}"#
)]
fn emit_module_with_mapping(
module_id: &str,
module: &Module,
_raw_hash: u64, // used for cache key
_raw_hash: u64, // used for cache key
_chunk_id: &str, // used for cache key
context: &Arc<Context>,
) -> Result<EmittedWithMapping> {
match &module.info.as_ref().unwrap().ast {
Expand Down Expand Up @@ -233,7 +234,13 @@ fn pot_to_chunk_module_object_string(
let emitted_modules_with_mapping = sorted_kv
.par_iter()
.map(|(module_id, module_and_hash)| {
emit_module_with_mapping(module_id, module_and_hash.0, module_and_hash.1, context)
emit_module_with_mapping(
module_id,
module_and_hash.0,
module_and_hash.1,
&pot.chunk_id,
context,
)
})
.collect::<Result<Vec<(String, Option<Vec<(BytePos, LineCol)>>)>>>()?;

Expand Down