user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Directly depend on cranelift_{codegen,frontend}

Browse source 
Fixes #838
This commit is contained in:
bjorn3 2019-12-24 12:40:18 +01:00
parent 047eaf14ba
commit 399cada762
12 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/debuginfo/line_info.rs
View file

@ -5,7 +5,7 @@ use crate::prelude::*;
use syntax::source_map::FileName;
use cranelift::codegen::binemit::CodeOffset;
use cranelift_codegen::binemit::CodeOffset;
use gimli::write::{
Address, AttributeValue, FileId, LineProgram, LineString, LineStringTable, UnitEntryId,
@ -104,7 +104,7 @@ impl<'a, 'tcx> FunctionDebugContext<'a, 'tcx> {
pub(crate) fn create_debug_lines(
&mut self,
context: &Context,
isa: &dyn cranelift::codegen::isa::TargetIsa,
isa: &dyn cranelift_codegen::isa::TargetIsa,
source_info_set: &indexmap::IndexSet<(Span, mir::SourceScope)>,
) -> CodeOffset {
let tcx = self.debug_context.tcx;

10
src/debuginfo/mod.rs
View file

@ -3,9 +3,9 @@ mod line_info;
use crate::prelude::*;
use cranelift::codegen::ir::{StackSlots, ValueLabel, ValueLoc};
use cranelift::codegen::isa::RegUnit;
use cranelift::codegen::ValueLocRange;
use cranelift_codegen::ir::{StackSlots, ValueLabel, ValueLoc};
use cranelift_codegen::isa::RegUnit;
use cranelift_codegen::ValueLocRange;
use gimli::write::{
self, Address, AttributeValue, DwarfUnit, Expression, LineProgram, LineString, Location,
@ -253,7 +253,7 @@ impl<'a, 'tcx> FunctionDebugContext<'a, 'tcx> {
pub fn define(
&mut self,
context: &Context,
isa: &dyn cranelift::codegen::isa::TargetIsa,
isa: &dyn cranelift_codegen::isa::TargetIsa,
source_info_set: &indexmap::IndexSet<(Span, mir::SourceScope)>,
local_map: HashMap<mir::Local, CPlace<'tcx>>,
) {
@ -312,7 +312,7 @@ fn place_location<'a, 'tcx>(
match cplace.inner() {
CPlaceInner::Var(local) => {
let value_label = cranelift::codegen::ir::ValueLabel::from_u32(local.as_u32());
let value_label = cranelift_codegen::ir::ValueLabel::from_u32(local.as_u32());
if let Some(value_loc_ranges) = value_labels_ranges.get(&value_label) {
let loc_list = LocationList(
value_loc_ranges