nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-28 17:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Render const pointers in MIR more compactly

Browse Source
This commit is contained in:
Oliver Scherer 2019-12-23 17:41:06 +01:00
parent dee12bb2b7
commit 9a2d5e87d6
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc/mir/interpret/mod.rs
View File

@ -166,9 +166,15 @@ pub enum LitToConstError {
Reported, Reported,
} }
#[derive(Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd, Debug)] #[derive(Copy, Clone, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub struct AllocId(pub u64); pub struct AllocId(pub u64);
impl fmt::Debug for AllocId {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(fmt, "alloc{}", self.0)
}
}
impl rustc_serialize::UseSpecializedEncodable for AllocId {} impl rustc_serialize::UseSpecializedEncodable for AllocId {}
impl rustc_serialize::UseSpecializedDecodable for AllocId {} impl rustc_serialize::UseSpecializedDecodable for AllocId {}

4
src/librustc/mir/interpret/pointer.rs
View File

@ -133,13 +133,13 @@ static_assert_size!(Pointer, 16);
impl<Tag: fmt::Debug, Id: fmt::Debug> fmt::Debug for Pointer<Tag, Id> { impl<Tag: fmt::Debug, Id: fmt::Debug> fmt::Debug for Pointer<Tag, Id> {
default fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { default fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{:?}.{:#x}[{:?}]", self.alloc_id, self.offset.bytes(), self.tag) write!(f, "{:?}+{:x}[{:?}]", self.alloc_id, self.offset.bytes(), self.tag)
} }
} }
// Specialization for no tag // Specialization for no tag
impl<Id: fmt::Debug> fmt::Debug for Pointer<(), Id> { impl<Id: fmt::Debug> fmt::Debug for Pointer<(), Id> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{:?}.{:#x}", self.alloc_id, self.offset.bytes()) write!(f, "{:?}+{:x}", self.alloc_id, self.offset.bytes())
} }
} }

4
src/test/mir-opt/const-promotion-extern-static.rs
View File

@ -14,7 +14,7 @@ fn main() {}
// START rustc.FOO.PromoteTemps.before.mir // START rustc.FOO.PromoteTemps.before.mir
// bb0: { // bb0: {
// ... // ...
// _5 = const Scalar(AllocId(1).0x0) : &i32; // _5 = const Scalar(alloc1+0) : &i32;
// _4 = &(*_5); // _4 = &(*_5);
// _3 = [move _4]; // _3 = [move _4];
// _2 = &_3; // _2 = &_3;
@ -31,7 +31,7 @@ fn main() {}
// START rustc.BAR.PromoteTemps.before.mir // START rustc.BAR.PromoteTemps.before.mir
// bb0: { // bb0: {
// ... // ...
// _5 = const Scalar(AllocId(0).0x0) : &i32; // _5 = const Scalar(alloc0+0) : &i32;
// _4 = &(*_5); // _4 = &(*_5);
// _3 = [move _4]; // _3 = [move _4];
// _2 = &_3; // _2 = &_3;

4
src/test/mir-opt/const_prop/read_immutable_static.rs
View File

@ -10,10 +10,10 @@ fn main() {
// START rustc.main.ConstProp.before.mir // START rustc.main.ConstProp.before.mir
// bb0: { // bb0: {
// ... // ...
// _3 = const Scalar(AllocId(0).0x0) : &u8; // _3 = const Scalar(alloc0+0) : &u8;
// _2 = (*_3); // _2 = (*_3);
// ... // ...
// _5 = const Scalar(AllocId(0).0x0) : &u8; // _5 = const Scalar(alloc0+0) : &u8;
// _4 = (*_5); // _4 = (*_5);
// _1 = Add(move _2, move _4); // _1 = Add(move _2, move _4);
// ... // ...