From 1d9481fdc80ecc7a33f703684ec0b6cbe56a79b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20A=C4=9Fcayaz=C4=B1?= Date: Wed, 11 Oct 2023 12:44:59 +0300 Subject: [PATCH 1/2] implement get_filename/lines for span --- compiler/rustc_smir/src/rustc_smir/mod.rs | 32 ++++++++++++++++++++++- compiler/stable_mir/src/lib.rs | 17 ++++++++---- compiler/stable_mir/src/ty.rs | 23 +++++++++++++++- 3 files changed, 65 insertions(+), 7 deletions(-) diff --git a/compiler/rustc_smir/src/rustc_smir/mod.rs b/compiler/rustc_smir/src/rustc_smir/mod.rs index 2a265fc1f5bc0..0bf6dabc75e7e 100644 --- a/compiler/rustc_smir/src/rustc_smir/mod.rs +++ b/compiler/rustc_smir/src/rustc_smir/mod.rs @@ -18,7 +18,7 @@ use rustc_span::def_id::{CrateNum, DefId, LOCAL_CRATE}; use rustc_target::abi::FieldIdx; use stable_mir::mir::{CopyNonOverlapping, Statement, UserTypeProjection, VariantIdx}; use stable_mir::ty::{FloatTy, GenericParamDef, IntTy, Movability, RigidTy, Span, TyKind, UintTy}; -use stable_mir::{self, opaque, Context}; +use stable_mir::{self, opaque, Context, Filename}; use tracing::debug; mod alloc; @@ -54,6 +54,36 @@ impl<'tcx> Context for Tables<'tcx> { self.tcx.sess.source_map().span_to_diagnostic_string(self[span]) } + fn get_filename(&self, span: &Span) -> Filename { + opaque( + &self + .tcx + .sess + .source_map() + .span_to_filename(self[*span]) + .display(rustc_span::FileNameDisplayPreference::Short) + .to_string(), + ) + } + + fn get_lines(&self, span: &Span) -> Vec { + let lines = &self + .tcx + .sess + .source_map() + .span_to_lines(self[*span]) + .unwrap() + .lines + .iter() + .map(|line| stable_mir::ty::LineInfo { + line_index: line.line_index + 1, + start_col: line.start_col.0 + 1, + end_col: line.end_col.0 + 1, + }) + .collect::>(); + lines.to_vec() + } + fn def_kind(&mut self, def_id: stable_mir::DefId) -> stable_mir::DefKind { self.tcx.def_kind(self[def_id]).stable(self) } diff --git a/compiler/stable_mir/src/lib.rs b/compiler/stable_mir/src/lib.rs index f371f46204fe4..8ff2f16327a87 100644 --- a/compiler/stable_mir/src/lib.rs +++ b/compiler/stable_mir/src/lib.rs @@ -22,8 +22,8 @@ use std::fmt; use std::fmt::Debug; use self::ty::{ - GenericPredicates, Generics, ImplDef, ImplTrait, IndexedVal, Span, TraitDecl, TraitDef, Ty, - TyKind, + GenericPredicates, Generics, ImplDef, ImplTrait, IndexedVal, LineInfo, Span, TraitDecl, + TraitDef, Ty, TyKind, }; #[macro_use] @@ -108,6 +108,7 @@ pub struct Crate { } pub type DefKind = Opaque; +pub type Filename = Opaque; /// Holds information about an item in the crate. /// For now, it only stores the item DefId. Use functions inside `rustc_internal` module to @@ -196,13 +197,19 @@ pub trait Context { /// Find a crate with the given name. fn find_crates(&self, name: &str) -> Vec; - /// Prints the name of given `DefId` + /// Returns the name of given `DefId` fn name_of_def_id(&self, def_id: DefId) -> String; - /// Prints a human readable form of `Span` + /// Returns printable, human readable form of `Span` fn print_span(&self, span: Span) -> String; - /// Prints the kind of given `DefId` + /// Return filename from given `Span`, for diagnostic purposes + fn get_filename(&self, span: &Span) -> Filename; + + /// Return lines corresponding to this `Span` + fn get_lines(&self, span: &Span) -> Vec; + + /// Returns the `kind` of given `DefId` fn def_kind(&mut self, def_id: DefId) -> DefKind; /// `Span` of an item diff --git a/compiler/stable_mir/src/ty.rs b/compiler/stable_mir/src/ty.rs index 691af15da8ca8..83d1fc5bc4f36 100644 --- a/compiler/stable_mir/src/ty.rs +++ b/compiler/stable_mir/src/ty.rs @@ -3,7 +3,7 @@ use super::{ mir::{Body, Mutability}, with, AllocId, DefId, Symbol, }; -use crate::Opaque; +use crate::{Filename, Opaque}; use std::fmt::{self, Debug, Formatter}; #[derive(Copy, Clone)] @@ -86,6 +86,27 @@ impl Debug for Span { } } +impl Span { + /// Return filename for diagnostic purposes + pub fn get_filename(&self) -> Filename { + with(|c| c.get_filename(self)) + } + + /// Return lines that corespond to this `Span` + pub fn get_lines(&self) -> Vec { + with(|c| c.get_lines(&self)) + } +} + +#[derive(Clone, Copy, Debug)] +/// Information you get from `Span` in a struct form. +/// Line and col start from 1. +pub struct LineInfo { + pub line_index: usize, + pub start_col: usize, + pub end_col: usize, +} + impl IndexedVal for Span { fn to_val(index: usize) -> Self { Span(index) From d6a55d3409e9e875e6d65ad5daecee4c7ea8449b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20A=C4=9Fcayaz=C4=B1?= Date: Fri, 13 Oct 2023 11:44:38 +0300 Subject: [PATCH 2/2] change fn name, return loc info, local name --- compiler/rustc_smir/src/rustc_smir/mod.rs | 27 +++++++---------------- compiler/stable_mir/src/lib.rs | 4 ++-- compiler/stable_mir/src/ty.rs | 7 +++--- 3 files changed, 14 insertions(+), 24 deletions(-) diff --git a/compiler/rustc_smir/src/rustc_smir/mod.rs b/compiler/rustc_smir/src/rustc_smir/mod.rs index 0bf6dabc75e7e..f26d18ad38f23 100644 --- a/compiler/rustc_smir/src/rustc_smir/mod.rs +++ b/compiler/rustc_smir/src/rustc_smir/mod.rs @@ -17,7 +17,9 @@ use rustc_middle::ty::{self, Ty, TyCtxt, Variance}; use rustc_span::def_id::{CrateNum, DefId, LOCAL_CRATE}; use rustc_target::abi::FieldIdx; use stable_mir::mir::{CopyNonOverlapping, Statement, UserTypeProjection, VariantIdx}; -use stable_mir::ty::{FloatTy, GenericParamDef, IntTy, Movability, RigidTy, Span, TyKind, UintTy}; +use stable_mir::ty::{ + FloatTy, GenericParamDef, IntTy, LineInfo, Movability, RigidTy, Span, TyKind, UintTy, +}; use stable_mir::{self, opaque, Context, Filename}; use tracing::debug; @@ -50,7 +52,7 @@ impl<'tcx> Context for Tables<'tcx> { self.tcx.def_path_str(self[def_id]) } - fn print_span(&self, span: stable_mir::ty::Span) -> String { + fn span_to_string(&self, span: stable_mir::ty::Span) -> String { self.tcx.sess.source_map().span_to_diagnostic_string(self[span]) } @@ -61,27 +63,14 @@ impl<'tcx> Context for Tables<'tcx> { .sess .source_map() .span_to_filename(self[*span]) - .display(rustc_span::FileNameDisplayPreference::Short) + .display(rustc_span::FileNameDisplayPreference::Local) .to_string(), ) } - fn get_lines(&self, span: &Span) -> Vec { - let lines = &self - .tcx - .sess - .source_map() - .span_to_lines(self[*span]) - .unwrap() - .lines - .iter() - .map(|line| stable_mir::ty::LineInfo { - line_index: line.line_index + 1, - start_col: line.start_col.0 + 1, - end_col: line.end_col.0 + 1, - }) - .collect::>(); - lines.to_vec() + fn get_lines(&self, span: &Span) -> LineInfo { + let lines = &self.tcx.sess.source_map().span_to_location_info(self[*span]); + LineInfo { start_line: lines.1, start_col: lines.2, end_line: lines.3, end_col: lines.4 } } fn def_kind(&mut self, def_id: stable_mir::DefId) -> stable_mir::DefKind { diff --git a/compiler/stable_mir/src/lib.rs b/compiler/stable_mir/src/lib.rs index 8ff2f16327a87..a3b05f2435eb6 100644 --- a/compiler/stable_mir/src/lib.rs +++ b/compiler/stable_mir/src/lib.rs @@ -201,13 +201,13 @@ pub trait Context { fn name_of_def_id(&self, def_id: DefId) -> String; /// Returns printable, human readable form of `Span` - fn print_span(&self, span: Span) -> String; + fn span_to_string(&self, span: Span) -> String; /// Return filename from given `Span`, for diagnostic purposes fn get_filename(&self, span: &Span) -> Filename; /// Return lines corresponding to this `Span` - fn get_lines(&self, span: &Span) -> Vec; + fn get_lines(&self, span: &Span) -> LineInfo; /// Returns the `kind` of given `DefId` fn def_kind(&mut self, def_id: DefId) -> DefKind; diff --git a/compiler/stable_mir/src/ty.rs b/compiler/stable_mir/src/ty.rs index 83d1fc5bc4f36..003045a4696d5 100644 --- a/compiler/stable_mir/src/ty.rs +++ b/compiler/stable_mir/src/ty.rs @@ -81,7 +81,7 @@ impl Debug for Span { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { f.debug_struct("Span") .field("id", &self.0) - .field("repr", &with(|cx| cx.print_span(*self))) + .field("repr", &with(|cx| cx.span_to_string(*self))) .finish() } } @@ -93,7 +93,7 @@ impl Span { } /// Return lines that corespond to this `Span` - pub fn get_lines(&self) -> Vec { + pub fn get_lines(&self) -> LineInfo { with(|c| c.get_lines(&self)) } } @@ -102,8 +102,9 @@ impl Span { /// Information you get from `Span` in a struct form. /// Line and col start from 1. pub struct LineInfo { - pub line_index: usize, + pub start_line: usize, pub start_col: usize, + pub end_line: usize, pub end_col: usize, }