add span to statements

Author: ouz-a

compiler/rustc_smir/src/rustc_smir/mod.rs

@@ -15,7 +15,7 @@ use rustc_middle::mir::interpret::{alloc_range, AllocId};
 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, UserTypeProjection, VariantIdx};
+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 tracing::debug;
@@ -232,39 +232,74 @@ impl<'tcx> Stable<'tcx> for mir::Statement<'tcx> {
     fn stable(&self, tables: &mut Tables<'tcx>) -> Self::T {
         use rustc_middle::mir::StatementKind::*;
         match &self.kind {
-            Assign(assign) => {
-                stable_mir::mir::Statement::Assign(assign.0.stable(tables), assign.1.stable(tables))
-            }
-            FakeRead(fake_read_place) => stable_mir::mir::Statement::FakeRead(
-                fake_read_place.0.stable(tables),
-                fake_read_place.1.stable(tables),
-            ),
-            SetDiscriminant { place: plc, variant_index: idx } => {
-                stable_mir::mir::Statement::SetDiscriminant {
+            Assign(assign) => Statement {
+                kind: stable_mir::mir::StatementKind::Assign(
+                    assign.0.stable(tables),
+                    assign.1.stable(tables),
+                ),
+                span: self.source_info.span.stable(tables),
+            },
+            FakeRead(fake_read_place) => Statement {
+                kind: stable_mir::mir::StatementKind::FakeRead(
+                    fake_read_place.0.stable(tables),
+                    fake_read_place.1.stable(tables),
+                ),
+                span: self.source_info.span.stable(tables),
+            },
+            SetDiscriminant { place: plc, variant_index: idx } => Statement {
+                kind: stable_mir::mir::StatementKind::SetDiscriminant {
                     place: plc.as_ref().stable(tables),
                     variant_index: idx.stable(tables),
-                }
-            }
-            Deinit(place) => stable_mir::mir::Statement::Deinit(place.stable(tables)),
-            StorageLive(place) => stable_mir::mir::Statement::StorageLive(place.stable(tables)),
-            StorageDead(place) => stable_mir::mir::Statement::StorageDead(place.stable(tables)),
-            Retag(retag, place) => {
-                stable_mir::mir::Statement::Retag(retag.stable(tables), place.stable(tables))
-            }
-            PlaceMention(place) => stable_mir::mir::Statement::PlaceMention(place.stable(tables)),
-            AscribeUserType(place_projection, variance) => {
-                stable_mir::mir::Statement::AscribeUserType {
+                },
+                span: self.source_info.span.stable(tables),
+            },
+            Deinit(place) => Statement {
+                kind: stable_mir::mir::StatementKind::Deinit(place.stable(tables)),
+                span: self.source_info.span.stable(tables),
+            },
+            StorageLive(place) => Statement {
+                kind: stable_mir::mir::StatementKind::StorageLive(place.stable(tables)),
+                span: self.source_info.span.stable(tables),
+            },
+            StorageDead(place) => Statement {
+                kind: stable_mir::mir::StatementKind::StorageDead(place.stable(tables)),
+                span: self.source_info.span.stable(tables),
+            },
+            Retag(retag, place) => Statement {
+                kind: stable_mir::mir::StatementKind::Retag(
+                    retag.stable(tables),
+                    place.stable(tables),
+                ),
+                span: self.source_info.span.stable(tables),
+            },
+            PlaceMention(place) => Statement {
+                kind: stable_mir::mir::StatementKind::PlaceMention(place.stable(tables)),
+                span: self.source_info.span.stable(tables),
+            },
+            AscribeUserType(place_projection, variance) => Statement {
+                kind: stable_mir::mir::StatementKind::AscribeUserType {
                     place: place_projection.as_ref().0.stable(tables),
                     projections: place_projection.as_ref().1.stable(tables),
                     variance: variance.stable(tables),
-                }
-            }
-            Coverage(coverage) => stable_mir::mir::Statement::Coverage(opaque(coverage)),
-            Intrinsic(intrinstic) => {
-                stable_mir::mir::Statement::Intrinsic(intrinstic.stable(tables))
-            }
-            ConstEvalCounter => stable_mir::mir::Statement::ConstEvalCounter,
-            Nop => stable_mir::mir::Statement::Nop,
+                },
+                span: self.source_info.span.stable(tables),
+            },
+            Coverage(coverage) => Statement {
+                kind: stable_mir::mir::StatementKind::Coverage(opaque(coverage)),
+                span: self.source_info.span.stable(tables),
+            },
+            Intrinsic(intrinstic) => Statement {
+                kind: stable_mir::mir::StatementKind::Intrinsic(intrinstic.stable(tables)),
+                span: self.source_info.span.stable(tables),
+            },
+            ConstEvalCounter => Statement {
+                kind: stable_mir::mir::StatementKind::ConstEvalCounter,
+                span: self.source_info.span.stable(tables),
+            },
+            Nop => Statement {
+                kind: stable_mir::mir::StatementKind::Nop,
+                span: self.source_info.span.stable(tables),
+            },
         }
     }
 }

compiler/stable_mir/src/mir/body.rs

@@ -191,7 +191,13 @@ pub enum NonDivergingIntrinsic {
 }
 
 #[derive(Clone, Debug)]
-pub enum Statement {
+pub struct Statement {
+    pub kind: StatementKind,
+    pub span: Span,
+}
+
+#[derive(Clone, Debug)]
+pub enum StatementKind {
     Assign(Place, Rvalue),
     FakeRead(FakeReadCause, Place),
     SetDiscriminant { place: Place, variant_index: VariantIdx },