Split smir Const
into TyConst
and MirConst
This commit is contained in:
parent
27529d5c25
commit
7e08f80b34
14 changed files with 285 additions and 134 deletions
|
@ -22,7 +22,7 @@ use rustc_smir::rustc_internal;
|
|||
use stable_mir::mir::alloc::GlobalAlloc;
|
||||
use stable_mir::mir::mono::Instance;
|
||||
use stable_mir::mir::{Body, Constant, Operand, Rvalue, StatementKind, TerminatorKind};
|
||||
use stable_mir::ty::{Const, ConstantKind};
|
||||
use stable_mir::ty::{ConstantKind, MirConst};
|
||||
use stable_mir::{CrateDef, CrateItems, ItemKind};
|
||||
use std::convert::TryFrom;
|
||||
use std::io::Write;
|
||||
|
@ -77,7 +77,7 @@ fn check_msg(body: &Body, expected: &str) {
|
|||
};
|
||||
assert_eq!(alloc.provenance.ptrs.len(), 1);
|
||||
|
||||
let alloc_prov_id = alloc.provenance.ptrs[0].1 .0;
|
||||
let alloc_prov_id = alloc.provenance.ptrs[0].1.0;
|
||||
let GlobalAlloc::Memory(val) = GlobalAlloc::from(alloc_prov_id) else {
|
||||
unreachable!()
|
||||
};
|
||||
|
@ -95,7 +95,7 @@ fn change_panic_msg(mut body: Body, new_msg: &str) -> Body {
|
|||
for bb in &mut body.blocks {
|
||||
match &mut bb.terminator.kind {
|
||||
TerminatorKind::Call { args, .. } => {
|
||||
let new_const = Const::from_str(new_msg);
|
||||
let new_const = MirConst::from_str(new_msg);
|
||||
args[0] = Operand::Constant(Constant {
|
||||
literal: new_const,
|
||||
span: bb.terminator.span,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue