Skip to content
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

Fix misc printing issues in emit=stable_mir #118364

Closed
wants to merge 2 commits into from
Closed

Fix misc printing issues in emit=stable_mir #118364

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
cb192af
add stable_mir output test
ouz-a Nov 27, 2023
dc78b1c
update test, compress push_str misc fixes
ouz-a Dec 1, 2023
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
10 changes: 9 additions & 1 deletion compiler/rustc_smir/src/rustc_smir/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ use stable_mir::ty::{
AdtDef, AdtKind, Allocation, ClosureDef, ClosureKind, Const, FieldDef, FnDef, GenericArgs,
LineInfo, PolyFnSig, RigidTy, Span, Ty, TyKind, VariantDef,
};
use stable_mir::{Crate, CrateItem, DefId, Error, Filename, ItemKind, Symbol};
use stable_mir::{
self, opaque, Crate, CrateItem, DefId, Error, Filename, ItemKind, Opaque, Symbol,
};
use std::cell::RefCell;

use crate::rustc_internal::{internal, RustcInternal};
Expand Down Expand Up @@ -297,6 +299,12 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
internal(cnst).to_string()
}

fn adt_literal(&self, adt: &AdtDef) -> Opaque {
let mut tables = self.0.borrow_mut();
let internal = adt.internal(&mut *tables);
opaque(&internal)
}

fn span_of_an_item(&self, def_id: stable_mir::DefId) -> Span {
let mut tables = self.0.borrow_mut();
tables.tcx.def_span(tables[def_id]).stable(&mut *tables)
Expand Down
7 changes: 5 additions & 2 deletions compiler/stable_mir/src/compiler_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ use crate::ty::{
TraitDef, Ty, TyKind, VariantDef,
};
use crate::{
mir, Crate, CrateItem, CrateItems, DefId, Error, Filename, ImplTraitDecls, ItemKind, Symbol,
TraitDecls,
mir, Crate, CrateItem, CrateItems, DefId, Error, Filename, ImplTraitDecls, ItemKind, Opaque,
Symbol, TraitDecls,
};

/// This trait defines the interface between stable_mir and the Rust compiler.
Expand Down Expand Up @@ -106,6 +106,9 @@ pub trait Context {
/// Returns literal value of a const as a string.
fn const_literal(&self, cnst: &Const) -> String;

/// Returns literal version of a Adt as a Opaque
fn adt_literal(&self, adt: &AdtDef) -> Opaque;

/// `Span` of an item
fn span_of_an_item(&self, def_id: DefId) -> Span;

Expand Down
1 change: 1 addition & 0 deletions compiler/stable_mir/src/mir/body.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ impl Body {
Ok(())
})
.collect::<Result<Vec<_>, _>>()?;
writeln!(w, "}}")?;
Ok(())
}

Expand Down
120 changes: 52 additions & 68 deletions compiler/stable_mir/src/mir/pretty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,40 +7,42 @@ use std::{io, iter};

use super::{AssertMessage, BinOp, TerminatorKind};

use super::BorrowKind;

pub fn function_name(item: CrateItem) -> String {
let mut pretty_name = String::new();
let body = item.body();
pretty_name.push_str("fn ");
pretty_name.push_str(item.name().as_str());
pretty_name.push_str(format!("fn {}", item.name()).as_str());
if body.arg_locals().is_empty() {
pretty_name.push_str("()");
} else {
pretty_name.push_str("(");
}
body.arg_locals().iter().enumerate().for_each(|(index, local)| {
pretty_name.push_str(format!("_{}: ", index).as_str());
pretty_name.push_str(&pretty_ty(local.ty.kind()));
pretty_name.push_str(format!("_{}: {}", index, pretty_ty(local.ty.kind())).as_str());
});
if !body.arg_locals().is_empty() {
pretty_name.push_str(")");
}
let return_local = body.ret_local();
pretty_name.push_str(" -> ");
pretty_name.push_str(&pretty_ty(return_local.ty.kind()));
pretty_name.push_str(" {");
pretty_name.push_str(format!(" -> {} {{", pretty_ty(return_local.ty.kind())).as_str());
pretty_name
}

pub fn function_body(body: &Body) -> String {
let mut pretty_body = String::new();
body.inner_locals().iter().enumerate().for_each(|(index, local)| {
pretty_body.push_str(" ");
pretty_body.push_str(format!("let {}", ret_mutability(&local.mutability)).as_str());
pretty_body.push_str(format!("_{}: ", index).as_str());
pretty_body.push_str(format!("{}", pretty_ty(local.ty.kind())).as_str());
pretty_body.push_str(";\n");
pretty_body.push_str(
format!(
"let {}_{}: {};\n",
ret_mutability(&local.mutability),
index,
pretty_ty(local.ty.kind())
)
.as_str(),
);
});
pretty_body.push_str("}");
pretty_body
}

Expand All @@ -55,8 +57,7 @@ pub fn pretty_statement(statement: &StatementKind) -> String {
let mut pretty = String::new();
match statement {
StatementKind::Assign(place, rval) => {
pretty.push_str(format!(" _{} = ", place.local).as_str());
pretty.push_str(format!("{}", &pretty_rvalue(rval)).as_str());
pretty.push_str(format!(" _{} = {}", place.local, pretty_rvalue(rval)).as_str());
}
// FIXME: Add rest of the statements
StatementKind::FakeRead(_, _) => {
Expand Down Expand Up @@ -116,7 +117,7 @@ pub fn pretty_terminator<W: io::Write>(terminator: &TerminatorKind, w: &mut W) -
Ok(())
}
(1, false) => {
write!(w, " -> {:?}", successors[0])?;
write!(w, " -> bb{:?}", successors[0])?;
Ok(())
}
_ => {
Expand Down Expand Up @@ -153,9 +154,7 @@ pub fn pretty_terminator_head(terminator: &TerminatorKind) -> String {
Drop { place, .. } => format!(" drop(_{:?})", place.local),
Call { func, args, destination, .. } => {
pretty.push_str(" ");
pretty.push_str(format!("_{} = ", destination.local).as_str());
pretty.push_str(&pretty_operand(func));
pretty.push_str("(");
pretty.push_str(format!("_{} = {}(", destination.local, pretty_operand(func)).as_str());
args.iter().enumerate().for_each(|(i, arg)| {
if i > 0 {
pretty.push_str(", ");
Expand All @@ -170,9 +169,9 @@ pub fn pretty_terminator_head(terminator: &TerminatorKind) -> String {
if !expected {
pretty.push_str("!");
}
pretty.push_str(format!("{} bool),", &pretty_operand(cond)).as_str());
pretty.push_str(&pretty_assert_message(msg));
pretty.push_str(")");
pretty.push_str(
format!("{} bool),{})", &pretty_operand(cond), pretty_assert_message(msg)).as_str(),
);
pretty
}
InlineAsm { .. } => todo!(),
Expand Down Expand Up @@ -296,16 +295,14 @@ pub fn pretty_operand(operand: &Operand) -> String {
let mut pretty = String::new();
match operand {
Operand::Copy(copy) => {
pretty.push_str("");
pretty.push_str(format!("{}", copy.local).as_str());
pretty.push_str(format!("_{}", copy.local).as_str());
}
Operand::Move(mv) => {
pretty.push_str("move ");
pretty.push_str(format!("_{}", mv.local).as_str());
pretty.push_str(format!("move _{}", mv.local).as_str());
}
Operand::Constant(cnst) => {
pretty.push_str("const ");
pretty.push_str(with(|cx| cx.const_literal(&cnst.literal)).as_str());
pretty
.push_str(format!("const {}", with(|cx| cx.const_literal(&cnst.literal))).as_str());
}
}
pretty
Expand All @@ -315,13 +312,11 @@ pub fn pretty_rvalue(rval: &Rvalue) -> String {
let mut pretty = String::new();
match rval {
Rvalue::AddressOf(muta, addr) => {
pretty.push_str("&raw ");
pretty.push_str(&ret_mutability(muta));
pretty.push_str(format!("(*_{})", addr.local).as_str());
pretty.push_str(format!("&raw {}(*_{})", &ret_mutability(muta), addr.local).as_str());
}
Rvalue::Aggregate(aggregatekind, operands) => {
pretty.push_str(format!("{:#?}", aggregatekind).as_str());
pretty.push_str("(");
// FIXME: Add pretty_aggregate function that returns a pretty string
pretty.push_str(format!("{:#?} (", aggregatekind).as_str());
operands.iter().enumerate().for_each(|(i, op)| {
pretty.push_str(&pretty_operand(op));
if i != operands.len() - 1 {
Expand All @@ -330,61 +325,51 @@ pub fn pretty_rvalue(rval: &Rvalue) -> String {
});
pretty.push_str(")");
}
Rvalue::BinaryOp(bin, op, op2) => {
pretty.push_str(&pretty_operand(op));
pretty.push_str(" ");
pretty.push_str(format!("{:#?}", bin).as_str());
pretty.push_str(" ");
pretty.push_str(&pretty_operand(op2));
Rvalue::BinaryOp(bin, op1, op2) => {
pretty.push_str(
format!("{:#?}({}, {})", bin, &pretty_operand(op1), pretty_operand(op2)).as_str(),
);
}
Rvalue::Cast(_, op, ty) => {
pretty.push_str(&pretty_operand(op));
pretty.push_str(" as ");
pretty.push_str(&pretty_ty(ty.kind()));
pretty.push_str(format!("{} as {}", pretty_operand(op), pretty_ty(ty.kind())).as_str());
}
Rvalue::CheckedBinaryOp(bin, op1, op2) => {
pretty.push_str(&pretty_operand(op1));
pretty.push_str(" ");
pretty.push_str(format!("{:#?}", bin).as_str());
pretty.push_str(" ");
pretty.push_str(&pretty_operand(op2));
pretty.push_str(
format!("Checked{:#?}({}, {})", bin, &pretty_operand(op1), pretty_operand(op2))
.as_str(),
);
}
Rvalue::CopyForDeref(deref) => {
pretty.push_str("CopyForDeref");
pretty.push_str(format!("{}", deref.local).as_str());
pretty.push_str(format!("CopyForDeref{}", deref.local).as_str());
}
Rvalue::Discriminant(place) => {
pretty.push_str("discriminant");
pretty.push_str(format!("{}", place.local).as_str());
pretty.push_str(format!("discriminant{}", place.local).as_str());
}
Rvalue::Len(len) => {
pretty.push_str("len");
pretty.push_str(format!("{}", len.local).as_str());
pretty.push_str(format!("len{}", len.local).as_str());
}
Rvalue::Ref(_, borrowkind, place) => {
pretty.push_str("ref");
pretty.push_str(format!("{:#?}", borrowkind).as_str());
match borrowkind {
BorrowKind::Shared => pretty.push_str("&"),
BorrowKind::Fake => pretty.push_str("&fake "),
BorrowKind::Mut { .. } => pretty.push_str("&mut "),
}
pretty.push_str(format!("{}", place.local).as_str());
}
Rvalue::Repeat(op, cnst) => {
pretty.push_str(&pretty_operand(op));
pretty.push_str(" ");
pretty.push_str(&pretty_ty(cnst.ty().kind()));
pretty.push_str(
&format!("{} \" \" {}", &pretty_operand(op), pretty_ty(cnst.ty().kind())).as_str(),
);
}
Rvalue::ShallowInitBox(_, _) => (),
Rvalue::ThreadLocalRef(item) => {
pretty.push_str("thread_local_ref");
pretty.push_str(format!("{:#?}", item).as_str());
pretty.push_str(format!("thread_local_ref{:#?}", item).as_str());
}
Rvalue::NullaryOp(nul, ty) => {
pretty.push_str(format!("{:#?}", nul).as_str());
pretty.push_str(&pretty_ty(ty.kind()));
pretty.push_str(" ");
pretty.push_str(format!("{:#?} {} \" \"", nul, pretty_ty(ty.kind())).as_str());
}
Rvalue::UnaryOp(un, op) => {
pretty.push_str(&pretty_operand(op));
pretty.push_str(" ");
pretty.push_str(format!("{:#?}", un).as_str());
pretty.push_str(format!("{} \" \" {:#?}", pretty_operand(op), un).as_str());
}
Rvalue::Use(op) => pretty.push_str(&pretty_operand(op)),
}
Expand Down Expand Up @@ -418,7 +403,7 @@ pub fn pretty_ty(ty: TyKind) -> String {
FloatTy::F64 => "f64".to_string(),
},
RigidTy::Adt(def, _) => {
format!("{:#?}", with(|cx| cx.def_ty(def.0)))
format!("{}", with(|cx| cx.adt_literal(&def)))
}
RigidTy::Str => "str".to_string(),
RigidTy::Array(ty, len) => {
Expand Down Expand Up @@ -451,8 +436,7 @@ pub fn pretty_ty(ty: TyKind) -> String {
DynKind::Dyn => pretty.push_str("dyn "),
DynKind::DynStar => pretty.push_str("dyn* "),
}
pretty.push_str(format!("{:#?}", data).as_str());
pretty.push_str(format!(" + {:#?} )", region).as_str());
pretty.push_str(format!("{:#?} + {:#?}", data, region).as_str());
pretty
}
RigidTy::Never => "!".to_string(),
Expand Down
9 changes: 9 additions & 0 deletions tests/ui/stable-mir-print/basic_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,13 @@ fn bar(vec: &mut Vec<i32>) -> Vec<i32> {
new_vec
}

pub fn demux(input: u8) -> u8 {
match input {
0 => 10,
1 => 6,
2 => 8,
_ => 0,
}
}

fn main(){}
Loading