T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly use the VersionMarker in CachedFunc (#6062)

Browse Source
This commit is contained in:
bjorn3
2023-03-20 20:18:51 +01:00
committed by GitHub
parent dd7fa81b20
commit fc3c5d2414
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cranelift/codegen/src/incremental_cache.rs
View File

@@ -116,8 +116,10 @@ impl std::fmt::Display for CacheKeyHash {
#[derive(serde::Serialize, serde::Deserialize)] #[derive(serde::Serialize, serde::Deserialize)]
struct CachedFunc { struct CachedFunc {
stencil: CompiledCodeStencil, // Note: The version marker must be first to ensure deserialization stops in case of a version
// mismatch before attempting to deserialize the actual compiled code.
version_marker: VersionMarker, version_marker: VersionMarker,
stencil: CompiledCodeStencil,
} }
/// Key for caching a single function's compilation. /// Key for caching a single function's compilation.
@@ -216,8 +218,8 @@ pub fn serialize_compiled(
result: CompiledCodeStencil, result: CompiledCodeStencil,
) -> (CompiledCodeStencil, Result<Vec<u8>, bincode::Error>) { ) -> (CompiledCodeStencil, Result<Vec<u8>, bincode::Error>) {
let cached = CachedFunc { let cached = CachedFunc {
stencil: result,
version_marker: VersionMarker, version_marker: VersionMarker,
stencil: result,
}; };
let result = bincode::serialize(&cached); let result = bincode::serialize(&cached);
(cached.stencil, result) (cached.stencil, result)