Skip to content

Avoid strict type comparison in statement assignment #110

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
adpaco-aws merged 3 commits into from
May 4, 2021
Merged

Avoid strict type comparison in statement assignment #110

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2f83f9
Workaround for issue #95
nchong-at-aws Apr 22, 2021
0948f59
Merge branch 'main-151-2021-04-26' into turn-off-statement-assign-assert
adpaco-aws Apr 30, 2021
05f9840
Print types in assert statement
adpaco-aws May 4, 2021
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
23 changes: 22 additions & 1 deletion compiler/rustc_codegen_llvm/src/gotoc/cbmc/goto_program/stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use self::StmtBody::*;
use super::{BuiltinFn, Expr, Location};
use std::fmt::Debug;
use tracing::debug;

///////////////////////////////////////////////////////////////////////////////////////////////
/// Datatypes
Expand Down Expand Up @@ -150,7 +151,27 @@ macro_rules! stmt {
impl Stmt {
/// `lhs = rhs;`
pub fn assign(lhs: Expr, rhs: Expr, loc: Location) -> Self {
assert_eq!(lhs.typ(), rhs.typ());
//Temporarily work around https://github.com/model-checking/rmc/issues/95
//by disabling the assert and soundly assigning nondet
//assert_eq!(lhs.typ(), rhs.typ());
if lhs.typ() != rhs.typ() {
debug!(
"WARNING: assign statement with unequal types lhs {:?} rhs {:?}",
lhs.typ(),
rhs.typ()
);
let assert_stmt = Stmt::assert_false(
&format!(
"Reached assignment statement with unequal types {:?} {:?}",
lhs.typ(),
rhs.typ()
),
loc.clone(),
);
let nondet_value = lhs.typ().nondet();
let nondet_assign_stmt = stmt!(Assign { lhs, rhs: nondet_value }, loc.clone());
return Stmt::block(vec![assert_stmt, nondet_assign_stmt]);
}
stmt!(Assign { lhs, rhs }, loc)
}

Expand Down