Skip to content

Commit

Permalink
static with body
Browse files Browse the repository at this point in the history
  • Loading branch information
@Medowhill
Medowhill committed Dec 12, 2023
1 parent 36f9141 commit 9b109ff
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 31 deletions.
20 changes: 16 additions & 4 deletions src/steensgaard/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,17 @@ pub fn analyze(tcx: TyCtxt<'_>) -> AnalysisResults {
let def_id = local_def_id.to_def_id();
match item.kind {
ItemKind::Static(_, _, _) => {
let body = tcx.mir_for_ctfe(def_id);
let local_decls = body.local_decls.len();

for i in 0..local_decls {
let id = VarId::Local(local_def_id, i as _);
analyzer.insert_and_allocate(id);
}

let id = VarId::Global(local_def_id);
analyzer.insert_and_allocate(id);
analyzer.x_eq_y(id, VarId::Local(local_def_id, 0));
}
ItemKind::Fn(_, _, _) => {
let body = tcx.optimized_mir(def_id);
Expand All @@ -67,14 +76,17 @@ pub fn analyze(tcx: TyCtxt<'_>) -> AnalysisResults {

for item_id in hir.items() {
let item = hir.item(item_id);
// if !matches!(item.kind, ItemKind::Static(_, _, _) | ItemKind::Fn(_, _, _)) {
if !matches!(item.kind, ItemKind::Fn(_, _, _)) {
if !matches!(item.kind, ItemKind::Static(_, _, _) | ItemKind::Fn(_, _, _)) {
continue;
}

let local_def_id = item.owner_id.def_id;
let def_id = local_def_id.to_def_id();
let body = tcx.optimized_mir(def_id);
let body = if matches!(item.kind, ItemKind::Fn(_, _, _)) {
tcx.optimized_mir(def_id)
} else {
tcx.mir_for_ctfe(def_id)
};
for bbd in body.basic_blocks.iter() {
for stmt in &bbd.statements {
println!("{:?}", stmt);
Expand Down Expand Up @@ -432,7 +444,7 @@ impl<'tcx, 'a> Analyzer<'tcx, 'a> {
}

fn transfer_stmt(&mut self, func: LocalDefId, stmt: &Statement<'tcx>) {
let StatementKind::Assign(box (l, r)) = &stmt.kind else { unreachable!() };
let StatementKind::Assign(box (l, r)) = &stmt.kind else { return };
let l_id = VarId::Local(func, l.local.as_u32());
let l_deref = l.is_indirect_first_projection();
match r {
Expand Down
100 changes: 73 additions & 27 deletions src/steensgaard/test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ fn run_compiler<F: FnOnce(TyCtxt<'_>) + Send>(code: &str, f: F) {
compile_util::run_compiler(config, f);
}

fn analyze_fn<F: FnOnce(Vec<VarId>, Vec<Type>, TyCtxt<'_>) + Send>(code: &str, f: F) {
fn analyze_fn<F>(code: &str, f: F)
where F: FnOnce(Vec<VarId>, Vec<Type>, AnalysisResults, TyCtxt<'_>) + Send {
let name = "foo";
let code = format!(
"
Expand All @@ -25,7 +26,7 @@ fn analyze_fn<F: FnOnce(Vec<VarId>, Vec<Type>, TyCtxt<'_>) + Send>(code: &str, f
let (def_id, n) = find_item(name, tcx);
let x: Vec<_> = (0..n).map(|i| res.local(def_id, i)).collect();
let t: Vec<_> = x.iter().map(|x| res.var_ty(*x)).collect();
f(x, t, tcx);
f(x, t, res, tcx);
});
}

Expand Down Expand Up @@ -57,7 +58,7 @@ fn test_eq_ref() {
let mut x: libc::c_int = 0 as libc::c_int;
let mut y: *mut libc::c_int = &mut x;
",
|x, t, _| {
|x, t, _, _| {
assert_ne!(x[2], x[3]);
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
Expand All @@ -79,7 +80,7 @@ fn test_eq_ref_twice() {
let mut y: *mut libc::c_int = &mut x;
y = &mut x;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
Expand Down Expand Up @@ -107,7 +108,7 @@ fn test_eq_ref_join() {
let mut y2: *mut libc::c_int = &mut x2;
y1 = &mut x2;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
assert_eq!(t[5].var_ty, x[1]);
Expand Down Expand Up @@ -144,7 +145,7 @@ fn test_eq_ref_join_2() {
let mut z2: *mut *mut libc::c_int = &mut y2;
z1 = &mut y2;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[7].var_ty, x[3]);
assert_eq!(t[8].var_ty, x[3]);
assert_eq!(t[9].var_ty, x[3]);
Expand Down Expand Up @@ -178,7 +179,7 @@ fn test_eq() {
let mut z: *mut libc::c_int = 0 as *mut libc::c_int;
z = y;
",
|x, t, _| {
|x, t, _, _| {
assert_ne!(x[2], x[3]);
assert_ne!(x[2], x[4]);
assert_ne!(x[3], x[4]);
Expand All @@ -200,7 +201,7 @@ fn test_eq_bot() {
let mut z: *mut libc::c_int = 0 as *mut libc::c_int;
z = y;
",
|_, t, _| {
|_, t, _, _| {
assert_ne!(t[1].var_ty, t[2].var_ty);
},
);
Expand All @@ -223,7 +224,7 @@ fn test_eq_bot2() {
z = y;
z = &mut x;
",
|x, t, _| {
|x, t, _, _| {
assert_ne!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
Expand All @@ -250,7 +251,7 @@ fn test_eq_pending() {
z = y;
y = &mut x;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
Expand Down Expand Up @@ -278,7 +279,7 @@ fn test_eq_pending_2() {
z = y;
y = &mut x;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
Expand Down Expand Up @@ -321,7 +322,7 @@ fn test_eq_join() {
}
let mut c: *mut *mut libc::c_int = &mut y;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[7].var_ty, x[3]);
assert_eq!(t[8].var_ty, x[3]);
assert_eq!(t[13].var_ty, x[3]);
Expand Down Expand Up @@ -354,7 +355,7 @@ fn test_eq_deref() {
let mut z: *mut *mut libc::c_int = &mut y;
let mut w: *mut libc::c_int = *z;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[4].var_ty, x[2]);
assert_eq!(t[5].var_ty, x[2]);
assert_eq!(t[2].var_ty, x[1]);
Expand Down Expand Up @@ -385,7 +386,7 @@ fn test_eq_deref_bot() {
let mut w: *mut libc::c_int = 0 as *mut libc::c_int;
y = &mut w;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[1].var_ty, x[6]);
assert_eq!(t[7].var_ty, x[6]);
assert_eq!(t[8].var_ty, x[6]);
Expand Down Expand Up @@ -424,7 +425,7 @@ fn test_eq_deref_pending() {
let mut w: *mut libc::c_int = 0 as *mut libc::c_int;
y1 = &mut w;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[1].var_ty, x[8]);
assert_eq!(t[2].var_ty, x[8]);
assert_eq!(t[3].var_ty, x[8]);
Expand Down Expand Up @@ -456,7 +457,7 @@ fn test_deref_eq() {
let mut w: *mut libc::c_int = &mut z;
*y = w;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[1].var_ty, x[4]);
Expand Down Expand Up @@ -490,7 +491,7 @@ fn test_deref_eq_bot() {
let mut w: *mut libc::c_int = 0 as *mut libc::c_int;
x = &mut w;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[8].var_ty, x[7]);
assert_eq!(t[9].var_ty, x[7]);
assert_eq!(t[1].var_ty, x[7]);
Expand Down Expand Up @@ -520,7 +521,7 @@ fn test_eq_alloc() {
x = malloc(::std::mem::size_of::<libc::c_int>() as libc::c_ulong)
as *mut libc::c_int;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
Expand All @@ -541,7 +542,7 @@ fn test_eq_alloc_bot() {
) as *mut libc::c_int;
let mut y: *mut libc::c_int = x;
",
|_, t, _| {
|_, t, _, _| {
assert_eq!(t[1].var_ty, t[2].var_ty);
},
);
Expand Down Expand Up @@ -574,7 +575,7 @@ fn test_eq_add() {
let mut w: libc::c_long = z + 1 as libc::c_int as libc::c_long;
let mut v: *mut libc::c_char = w as *mut libc::c_char;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[6].var_ty, x[1]);
assert_eq!(t[7].var_ty, x[1]);
assert_eq!(t[8].var_ty, x[1]);
Expand All @@ -600,7 +601,7 @@ fn test_eq_eq() {
let mut y: *mut libc::c_int = &mut x;
let mut z: libc::c_int = (y == 0 as *mut libc::c_int) as libc::c_int;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_ne!(t[4].var_ty, x[1]);
Expand All @@ -627,7 +628,7 @@ fn test_eq_neg() {
let mut v: libc::c_long = -w;
let mut u: *mut libc::c_int = v as *mut libc::c_int;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
Expand All @@ -649,7 +650,7 @@ fn test_eq_not() {
let mut v: libc::c_long = -w;
let mut u: *mut libc::c_int = v as *mut libc::c_int;
",
|x, t, _| {
|x, t, _, _| {
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(t[4].var_ty, x[1]);
Expand All @@ -670,12 +671,57 @@ fn test_eq_static() {
static mut x: libc::c_int = 0 as libc::c_int;
let mut y: *mut libc::c_int = &mut x;
",
|_, t, tcx| {
|_, t, _, tcx| {
let (def_id, _) = find_item("x", tcx);
let x = VarId::Global(def_id);
assert_eq!(t[1].var_ty, x);
assert_eq!(t[2].var_ty, x);
assert_eq!(t[3].var_ty, x);
},
);
}

#[test]
fn test_static_eq() {
// _1 = const 0_i32
// _3 = &mut _1
// _2 = &raw mut (*_3)
// _4 = const {alloc1: *mut *mut i32}
// (*_4) = move _2
analyze_fn(
"
static mut x: *mut libc::c_int = 0 as *const libc::c_int as *mut libc::c_int;
let mut y: libc::c_int = 0 as libc::c_int;
x = &mut y;
",
|x, t, res, tcx| {
let (def_id, _) = find_item("x", tcx);
let x_id = VarId::Global(def_id);
let x_ty = res.var_ty(x_id);
assert_eq!(t[4].var_ty, x_id);
assert_eq!(t[2].var_ty, x[1]);
assert_eq!(t[3].var_ty, x[1]);
assert_eq!(x_ty.var_ty, x[1]);
},
);
}

#[test]
fn test_static2() {
analyze_fn(
"
static mut x: libc::c_int = 0 as libc::c_int;
static mut y: *mut libc::c_int = unsafe {
&x as *const libc::c_int as *mut libc::c_int
};
",
|_, _, res, tcx| {
let (def_id, _) = find_item("x", tcx);
let x_id = VarId::Global(def_id);
assert_eq!(t[1].var_ty, x_id);
assert_eq!(t[2].var_ty, x_id);
assert_eq!(t[3].var_ty, x_id);
let (def_id, _) = find_item("y", tcx);
let y_id = VarId::Global(def_id);
let y_ty = res.var_ty(y_id);
assert_eq!(y_ty.var_ty, x_id);
},
);
}

0 comments on commit 9b109ff

Please sign in to comment.