Skip to content

Relax the requirements for is_rust_box() to enable crate compilation #153

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
danielsn merged 1 commit into from
May 25, 2021
Merged

Relax the requirements for is_rust_box() to enable crate compilation #153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions compiler/rustc_codegen_llvm/src/gotoc/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl<'tcx> GotocCtx<'tcx> {
// };
// ```
// And notice that its `.pointer` field is exactly what we want.
assert!(e.typ().is_rust_box());
assert!(e.typ().is_rust_box(), "expected rust box {:?}", e);
let unique_ptr_typ =
self.symbol_table.lookup_field_type_in_type(e.typ(), "0").unwrap().clone();
assert!(unique_ptr_typ.is_rust_unique_pointer());
Expand All @@ -96,7 +96,7 @@ impl<'tcx> GotocCtx<'tcx> {
/// `boxed_type the_box = >>> { .0=nondet(), .1={ ._marker=nondet(), .pointer=boxed_value } } <<<`
/// `boxed_type` is the type of the resulting expression
pub fn box_value(&self, boxed_value: Expr, boxed_type: Type) -> Expr {
assert!(boxed_type.is_rust_box());
assert!(boxed_type.is_rust_box(), "expected rust box {:?}", boxed_type);
let get_field_type = |struct_typ, field| {
self.symbol_table.lookup_field_type_in_type(struct_typ, field).unwrap().clone()
};
Expand All @@ -119,11 +119,15 @@ impl<'tcx> GotocCtx<'tcx> {
}

impl Type {
/// Checks if the struct represents a Rust "Box"
/// Best effort check if the struct represents a Rust "Box". May return false positives.
pub fn is_rust_box(&self) -> bool {
self.type_name().map_or(false, |name| {
name.starts_with("tag-std::boxed::Box") || name.starts_with("tag-core::boxed::Box")
})
// We have seen variants on the name, including
// tag-std::boxed::Box, tag-core::boxed::Box, tag-boxed::Box.
// If we match on exact names, we're playing whack-a-mole trying to keep track of how this
// can be reimported.
// If we don't, we spuriously fail. https://github.com/model-checking/rmc/issues/113
// TODO: find a better way of checking this https://github.com/model-checking/rmc/issues/152
self.type_name().map_or(false, |name| name.contains("boxed::Box"))
}

/// Checks if the struct represents a Rust "Unique"
Expand Down