Move SourceLoc into compiler

This commit is contained in:
Syrus
2020-04-21 23:05:58 -07:00
parent 68b500ad84
commit b360bd40bb
9 changed files with 13 additions and 12 deletions

View File

@@ -1,6 +1,5 @@
use cranelift_codegen::{isa, Context};
use wasm_common::SourceLoc;
use wasmer_compiler::{FunctionAddressMap, FunctionBodyData, InstructionAddressMap};
use wasmer_compiler::{FunctionAddressMap, FunctionBodyData, InstructionAddressMap, SourceLoc};
pub fn get_function_address_map<'data>(
context: &Context,

View File

@@ -15,12 +15,13 @@ use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
use std::collections::HashMap;
use wasm_common::entity::{EntityRef, PrimaryMap, SecondaryMap};
use wasm_common::{
DefinedFuncIndex, Features, FuncIndex, FuncType, MemoryIndex, SignatureIndex, SourceLoc,
TableIndex,
DefinedFuncIndex, Features, FuncIndex, FuncType, MemoryIndex, SignatureIndex, TableIndex,
};
use wasmer_compiler::CompileError;
use wasmer_compiler::FunctionBodyData;
use wasmer_compiler::{Compilation, CompiledFunction, Compiler, JumpTable, TrapInformation};
use wasmer_compiler::{
Compilation, CompiledFunction, Compiler, JumpTable, SourceLoc, TrapInformation,
};
use wasmer_compiler::{CompilerConfig, ModuleTranslationState, Target};
use wasmer_compiler::{Relocation, RelocationTarget};
use wasmer_runtime::TrapCode;

View File

@@ -4,7 +4,8 @@
use cranelift_codegen::ir;
use serde::{Deserialize, Serialize};
use wasm_common::entity::PrimaryMap;
use wasm_common::{DefinedFuncIndex, SourceLoc};
use wasm_common::DefinedFuncIndex;
use wasmer_compiler::SourceLoc;
/// Single source location to generated address mapping.
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]