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

Move definition of ModuleMemoryOffset (#3228)

Browse Source 
This was historically defined in `wasmtime-environ` but it's only used
in `wasmtime-cranelift`, so this commit moves the definition to the
`debug` module where it's primarily used.
This commit is contained in:
Alex Crichton
2021-08-23 14:42:21 -05:00
committed by GitHub
parent 22ab535ad9
commit eb21ae149a
9 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/cranelift/src/debug/transform/expression.rs
View File

@@ -1,4 +1,5 @@
use super::address_transform::AddressTransform;
use crate::debug::ModuleMemoryOffset;
use anyhow::{Context, Error, Result};
use cranelift_codegen::ir::{LabelValueLoc, StackSlots, ValueLabel, ValueLoc};
use cranelift_codegen::isa::TargetIsa;
@@ -10,7 +11,7 @@ use std::cmp::PartialEq;
use std::collections::{HashMap, HashSet};
use std::hash::{Hash, Hasher};
use std::rc::Rc;
use wasmtime_environ::{DefinedFuncIndex, EntityRef, ModuleMemoryOffset};
use wasmtime_environ::{DefinedFuncIndex, EntityRef};
#[derive(Debug)]
pub struct FunctionFrameInfo<'a> {
@@ -1267,8 +1268,9 @@ mod tests {
#[test]
fn test_debug_value_range_builder() {
use super::ValueLabelRangesBuilder;
use crate::debug::ModuleMemoryOffset;
use cranelift_codegen::ir::StackSlots;
use wasmtime_environ::{DefinedFuncIndex, EntityRef, ModuleMemoryOffset};
use wasmtime_environ::{DefinedFuncIndex, EntityRef};
let addr_tr = create_mock_address_transform();
let stack_slots = StackSlots::new();