add stable_mir output test

rust-lang · Dec 17, 2023 · cb192af · cb192af
1 parent 5e70254
commit cb192af
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 19 deletions.
diff --git a/compiler/rustc_smir/src/rustc_smir/context.rs b/compiler/rustc_smir/src/rustc_smir/context.rs
@@ -3,7 +3,7 @@
 //! This trait is currently the main interface between the Rust compiler,
 //! and the `stable_mir` crate.
 
-use rustc_middle::ty;
+use crate::rustc_smir::stable_mir::opaque;
 use rustc_middle::ty::print::{with_forced_trimmed_paths, with_no_trimmed_paths};
 use rustc_middle::ty::{
     GenericPredicates, Instance, ParamEnv, ScalarInt, TypeVisitableExt, ValTree,
@@ -18,7 +18,8 @@ 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::Opaque;
+use stable_mir::{self, Crate, CrateItem, Error, Filename, ItemKind, Symbol};
 use std::cell::RefCell;
 
 use crate::rustc_internal::{internal, RustcInternal};
@@ -297,6 +298,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)

diff --git a/compiler/stable_mir/src/compiler_interface.rs b/compiler/stable_mir/src/compiler_interface.rs
@@ -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.
@@ -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;
 

diff --git a/compiler/stable_mir/src/mir/body.rs b/compiler/stable_mir/src/mir/body.rs
@@ -107,6 +107,7 @@ impl Body {
                 Ok(())
             })
             .collect::<Result<Vec<_>, _>>()?;
+        writeln!(w, "}}")?;
         Ok(())
     }
 

diff --git a/compiler/stable_mir/src/mir/pretty.rs b/compiler/stable_mir/src/mir/pretty.rs
@@ -7,6 +7,8 @@ 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();
@@ -40,7 +42,6 @@ pub fn function_body(body: &Body) -> String {
         pretty_body.push_str(format!("{}", pretty_ty(local.ty.kind())).as_str());
         pretty_body.push_str(";\n");
     });
-    pretty_body.push_str("}");
     pretty_body
 }
 
@@ -320,6 +321,7 @@ pub fn pretty_rvalue(rval: &Rvalue) -> String {
             pretty.push_str(format!("(*_{})", addr.local).as_str());
         }
         Rvalue::Aggregate(aggregatekind, operands) => {
+            // FIXME: Add pretty_aggregate function that returns a pretty string
             pretty.push_str(format!("{:#?}", aggregatekind).as_str());
             pretty.push_str("(");
             operands.iter().enumerate().for_each(|(i, op)| {
@@ -330,24 +332,26 @@ pub fn pretty_rvalue(rval: &Rvalue) -> String {
             });
             pretty.push_str(")");
         }
-        Rvalue::BinaryOp(bin, op, op2) => {
-            pretty.push_str(&pretty_operand(op));
-            pretty.push_str(" ");
+        Rvalue::BinaryOp(bin, op1, op2) => {
             pretty.push_str(format!("{:#?}", bin).as_str());
-            pretty.push_str(" ");
-            pretty.push_str(&pretty_operand(op2));
+            pretty.push_str("(");
+            pretty.push_str(format!("_{}", &pretty_operand(op1)).as_str());
+            pretty.push_str(", ");
+            pretty.push_str(format!("{}", &pretty_operand(op2)).as_str());
+            pretty.push_str(")");
         }
         Rvalue::Cast(_, op, ty) => {
             pretty.push_str(&pretty_operand(op));
             pretty.push_str(" as ");
             pretty.push_str(&pretty_ty(ty.kind()));
         }
         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).as_str());
+            pretty.push_str("(");
+            pretty.push_str(format!("_{}", &pretty_operand(op1)).as_str());
+            pretty.push_str(", ");
+            pretty.push_str(format!("{}", &pretty_operand(op2)).as_str());
+            pretty.push_str(")");
         }
         Rvalue::CopyForDeref(deref) => {
             pretty.push_str("CopyForDeref");
@@ -362,8 +366,11 @@ pub fn pretty_rvalue(rval: &Rvalue) -> String {
             pretty.push_str(format!("{}", 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) => {
@@ -418,7 +425,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) => {

diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
@@ -11,7 +11,7 @@ use std::path::{Path, PathBuf};
 const ENTRY_LIMIT: usize = 900;
 // FIXME: The following limits should be reduced eventually.
 const ISSUES_ENTRY_LIMIT: usize = 1852;
-const ROOT_ENTRY_LIMIT: usize = 867;
+const ROOT_ENTRY_LIMIT: usize = 868;
 
 const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
     "rs",     // test source files

diff --git a/tests/ui/stable-mir-print/basic_function.rs b/tests/ui/stable-mir-print/basic_function.rs
@@ -1,6 +1,9 @@
 // compile-flags: -Z unpretty=stable-mir -Z mir-opt-level=3
 // check-pass
+<<<<<<< HEAD
 // only-x86_64
+=======
+>>>>>>> 9a9a3a91e41 (add stable_mir output test)
 
 fn foo(i:i32) -> i32 {
     i + 1