Skip to content

Add method to retrieve body of closure in stable-mir #141307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2025
Merged

Add method to retrieve body of closure in stable-mir #141307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d66e66
add `body` to `ClosureDef`
b-naber May 20, 2025
8604e58
add doc comment and a test with a generic closure
b-naber Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions compiler/rustc_smir/src/stable_mir/ty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,14 @@ crate_def! {
pub ClosureDef;
}

impl ClosureDef {
/// Retrieves the body of the closure definition. Returns None if the body
/// isn't available.
pub fn body(&self) -> Option<Body> {
with(|ctx| ctx.has_body(self.0).then(|| ctx.mir_body(self.0)))
}
}

crate_def! {
#[derive(Serialize)]
pub CoroutineDef;
Expand Down
90 changes: 90 additions & 0 deletions tests/ui-fulldeps/stable-mir/closure-generic-body.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
//@ run-pass
//! Tests stable mir API for retrieving the body of a closure.

//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ edition: 2021

#![feature(rustc_private)]
#![feature(assert_matches)]

extern crate rustc_middle;
#[macro_use]
extern crate rustc_smir;
extern crate rustc_driver;
extern crate rustc_interface;
extern crate stable_mir;

use std::io::Write;
use std::ops::ControlFlow;

use stable_mir::mir::{Body, ConstOperand, Operand, TerminatorKind};
use stable_mir::ty::{FnDef, RigidTy, TyKind};

const CRATE_NAME: &str = "crate_closure_body";

fn test_closure_body() -> ControlFlow<()> {
let crate_items = stable_mir::all_local_items();
for item in crate_items {
let item_ty = item.ty();
match &item_ty.kind() {
TyKind::RigidTy(RigidTy::Closure(closure_def, _)) => {
let closure_body = closure_def.body().unwrap();
check_incr_closure_body(closure_body);
}
_ => {}
}
}

ControlFlow::Continue(())
}

fn check_incr_closure_body(body: Body) {
let first_block = &body.blocks[0];
let TerminatorKind::Call { func: Operand::Constant(ConstOperand { const_, .. }), .. } =
&first_block.terminator.kind
else {
panic!("expected Call Terminator, got: ");
};

let TyKind::RigidTy(RigidTy::FnDef(FnDef(def_id), ..), ..) = const_.ty().kind() else {
panic!("expected FnDef");
};

assert_eq!(def_id.name(), "id");
}

fn main() {
let path = "closure_body.rs";
generate_input(&path).unwrap();
let args = &[
"rustc".to_string(),
"-Cpanic=abort".to_string(),
"--crate-name".to_string(),
CRATE_NAME.to_string(),
path.to_string(),
];
run!(args, test_closure_body).unwrap();
}

fn generate_input(path: &str) -> std::io::Result<()> {
let mut file = std::fs::File::create(path)?;
write!(
file,
r#"
fn id<T>(y: T) -> T {{
y
}}

fn main() {{
let cl_id= |x| {{
id(x)
}};

let _= cl_id(5);
}}
"#
)?;
Ok(())
}
90 changes: 90 additions & 0 deletions tests/ui-fulldeps/stable-mir/closure_body.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
//@ run-pass
//! Tests stable mir API for retrieving the body of a closure.

//@ ignore-stage1
//@ ignore-cross-compile
//@ ignore-remote
//@ edition: 2021

#![feature(rustc_private)]
#![feature(assert_matches)]

extern crate rustc_middle;
#[macro_use]
extern crate rustc_smir;
extern crate rustc_driver;
extern crate rustc_interface;
extern crate stable_mir;

use std::io::Write;
use std::ops::ControlFlow;

use stable_mir::mir::{Body, ConstOperand, Operand, TerminatorKind};
use stable_mir::ty::{FnDef, RigidTy, TyKind};

const CRATE_NAME: &str = "crate_closure_body";

fn test_closure_body() -> ControlFlow<()> {
let crate_items = stable_mir::all_local_items();
for item in crate_items {
let item_ty = item.ty();
match &item_ty.kind() {
TyKind::RigidTy(RigidTy::Closure(closure_def, _)) => {
let closure_body = closure_def.body().unwrap();
check_incr_closure_body(closure_body);
}
_ => {}
}
}

ControlFlow::Continue(())
}

fn check_incr_closure_body(body: Body) {
let first_block = &body.blocks[0];
let TerminatorKind::Call { func: Operand::Constant(ConstOperand { const_, .. }), .. } =
&first_block.terminator.kind
else {
panic!("expected Call Terminator, got: ");
};

let TyKind::RigidTy(RigidTy::FnDef(FnDef(def_id), ..), ..) = const_.ty().kind() else {
panic!("expected FnDef");
};

assert_eq!(def_id.name(), "incr");
}

fn main() {
let path = "closure_body.rs";
generate_input(&path).unwrap();
let args = &[
"rustc".to_string(),
"-Cpanic=abort".to_string(),
"--crate-name".to_string(),
CRATE_NAME.to_string(),
path.to_string(),
];
run!(args, test_closure_body).unwrap();
}

fn generate_input(path: &str) -> std::io::Result<()> {
let mut file = std::fs::File::create(path)?;
write!(
file,
r#"
fn incr(y: i32) -> i32 {{
y + 1
}}

fn main() {{
let cl_incr = |x: i32| {{
incr(x)
}};

let _= cl_incr(5);
}}
"#
)?;
Ok(())
}
Loading