Stabilize find_debug_info (model-checking#2912)

Last time we stabilized model-checking#2882, this continues the trend and stabilizes `find_debug_info` as well.
tautschnig · Dec 8, 2023 · 01bf411 · 01bf411
1 parent 2aca488
commit 01bf411
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/span.rs
@@ -5,9 +5,10 @@
 
 use crate::codegen_cprover_gotoc::GotocCtx;
 use cbmc::goto_program::Location;
-use rustc_middle::mir::{Local, VarDebugInfo, VarDebugInfoContents};
+use rustc_middle::mir::{Local, VarDebugInfoContents};
 use rustc_smir::rustc_internal;
 use rustc_span::Span;
+use stable_mir::mir::VarDebugInfo;
 
 impl<'tcx> GotocCtx<'tcx> {
  pub fn codegen_span(&self, sp: &Span) -> Location {
@@ -43,10 +44,12 @@ impl<'tcx> GotocCtx<'tcx> {
  sp.map_or(Location::none(), |x| self.codegen_span(&x))
  }
 
- pub fn find_debug_info(&self, l: &Local) -> Option<&VarDebugInfo<'tcx>> {
- self.current_fn().mir().var_debug_info.iter().find(|info| match info.value {
- VarDebugInfoContents::Place(p) => p.local == *l && p.projection.len() == 0,
- VarDebugInfoContents::Const(_) => false,
- })
+ pub fn find_debug_info(&self, l: &Local) -> Option<VarDebugInfo> {
+ rustc_internal::stable(self.current_fn().mir().var_debug_info.iter().find(|info| {
+ match info.value {
+ VarDebugInfoContents::Place(p) => p.local == *l && p.projection.len() == 0,
+ VarDebugInfoContents::Const(_) => false,
+ }
+ }))
  }
 }
diff --git a/kani-compiler/src/codegen_cprover_gotoc/utils/names.rs b/kani-compiler/src/codegen_cprover_gotoc/utils/names.rs
@@ -22,7 +22,7 @@ impl<'tcx> GotocCtx<'tcx> {
  pub fn codegen_var_base_name(&self, l: &Local) -> String {
  match self.find_debug_info(l) {
  None => format!("var_{}", l.index()),
- Some(info) => format!("{}", info.name),
+ Some(info) => info.name,
  }
  }