Skip to content

Commit 7fd6546

Browse files
Refactor stubbing so Kani compiler only invoke rustc once per crate (rust-lang#3245)
Using stubs or function contracts as part of the `verify-std` sub-command does not work with multiple rustc executions as previous implementation. This happens because we now enable verifying dependencies, and cargo crashes due to a race condition. As soon as the first rustc invocation succeeds, cargo starts the compilation of the dependents crate. However, new executions can override files. Instead, we moved the stub logic to the new transformation framework, which is done on the top of the StableMIR body, and doesn't affect the Rust compiler session. We are now able to apply stub without restarting the compiler. This is a much better user experience as well, since multiple calls to the compiler can print the same warnings multiple times. Resolves rust-lang#3072 Towards rust-lang#3152 Co-authored-by: Felipe R. Monteiro <[email protected]>
1 parent 554532c commit 7fd6546

File tree

28 files changed

+987
-1074
lines changed

28 files changed

+987
-1074
lines changed

kani-compiler/src/codegen_cprover_gotoc/compiler_interface.rs

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ use crate::args::ReachabilityType;
77
use crate::codegen_cprover_gotoc::GotocCtx;
88
use crate::kani_middle::analysis;
99
use crate::kani_middle::attributes::{is_test_harness_description, KaniAttributes};
10-
use crate::kani_middle::metadata::{canonical_mangled_name, gen_test_metadata};
10+
use crate::kani_middle::codegen_units::{CodegenUnit, CodegenUnits};
11+
use crate::kani_middle::metadata::gen_test_metadata;
1112
use crate::kani_middle::provide;
1213
use crate::kani_middle::reachability::{
1314
collect_reachable_items, filter_const_crate_items, filter_crate_items,
@@ -17,7 +18,7 @@ use crate::kani_middle::{check_reachable_items, dump_mir_items};
1718
use crate::kani_queries::QueryDb;
1819
use cbmc::goto_program::Location;
1920
use cbmc::irep::goto_binary_serde::write_goto_binary_file;
20-
use cbmc::{InternString, RoundingMode};
21+
use cbmc::RoundingMode;
2122
use cbmc::{InternedString, MachineModel};
2223
use kani_metadata::artifact::convert_type;
2324
use kani_metadata::UnsupportedFeature;
@@ -49,7 +50,6 @@ use stable_mir::mir::mono::{Instance, MonoItem};
4950
use stable_mir::{CrateDef, DefId};
5051
use std::any::Any;
5152
use std::collections::BTreeMap;
52-
use std::collections::HashSet;
5353
use std::ffi::OsString;
5454
use std::fmt::Write;
5555
use std::fs::File;
@@ -231,43 +231,43 @@ impl CodegenBackend for GotocCodegenBackend {
231231
let base_filepath = tcx.output_filenames(()).path(OutputType::Object);
232232
let base_filename = base_filepath.as_path();
233233
let reachability = queries.args().reachability_analysis;
234-
let mut transformer = BodyTransformation::new(&queries, tcx);
235234
let mut results = GotoCodegenResults::new(tcx, reachability);
236235
match reachability {
237236
ReachabilityType::Harnesses => {
237+
let mut units = CodegenUnits::new(&queries, tcx);
238+
let mut modifies_instances = vec![];
238239
// Cross-crate collecting of all items that are reachable from the crate harnesses.
239-
let harnesses = queries.target_harnesses();
240-
let mut items: HashSet<_> = HashSet::with_capacity(harnesses.len());
241-
items.extend(harnesses);
242-
let harnesses = filter_crate_items(tcx, |_, instance| {
243-
items.contains(&instance.mangled_name().intern())
244-
});
245-
for harness in harnesses {
246-
let model_path =
247-
queries.harness_model_path(&harness.mangled_name()).unwrap();
248-
let contract_metadata =
249-
contract_metadata_for_harness(tcx, harness.def.def_id()).unwrap();
250-
let (gcx, items, contract_info) = self.codegen_items(
251-
tcx,
252-
&[MonoItem::Fn(harness)],
253-
model_path,
254-
&results.machine_model,
255-
contract_metadata,
256-
transformer,
257-
);
258-
transformer = results.extend(gcx, items, None);
259-
if let Some(assigns_contract) = contract_info {
260-
self.queries.lock().unwrap().register_assigns_contract(
261-
canonical_mangled_name(harness).intern(),
262-
assigns_contract,
240+
for unit in units.iter() {
241+
// We reset the body cache for now because each codegen unit has different
242+
// configurations that affect how we transform the instance body.
243+
let mut transformer = BodyTransformation::new(&queries, tcx, &unit);
244+
for harness in &unit.harnesses {
245+
let model_path = units.harness_model_path(*harness).unwrap();
246+
let contract_metadata =
247+
contract_metadata_for_harness(tcx, harness.def.def_id()).unwrap();
248+
let (gcx, items, contract_info) = self.codegen_items(
249+
tcx,
250+
&[MonoItem::Fn(*harness)],
251+
model_path,
252+
&results.machine_model,
253+
contract_metadata,
254+
transformer,
263255
);
256+
transformer = results.extend(gcx, items, None);
257+
if let Some(assigns_contract) = contract_info {
258+
modifies_instances.push((*harness, assigns_contract));
259+
}
264260
}
265261
}
262+
units.store_modifies(&modifies_instances);
263+
units.write_metadata(&queries, tcx);
266264
}
267265
ReachabilityType::Tests => {
268266
// We're iterating over crate items here, so what we have to codegen is the "test description" containing the
269267
// test closure that we want to execute
270268
// TODO: Refactor this code so we can guarantee that the pair (test_fn, test_desc) actually match.
269+
let unit = CodegenUnit::default();
270+
let mut transformer = BodyTransformation::new(&queries, tcx, &unit);
271271
let mut descriptions = vec![];
272272
let harnesses = filter_const_crate_items(tcx, &mut transformer, |_, item| {
273273
if is_test_harness_description(tcx, item.def) {
@@ -310,6 +310,8 @@ impl CodegenBackend for GotocCodegenBackend {
310310
}
311311
ReachabilityType::None => {}
312312
ReachabilityType::PubFns => {
313+
let unit = CodegenUnit::default();
314+
let transformer = BodyTransformation::new(&queries, tcx, &unit);
313315
let main_instance =
314316
stable_mir::entry_fn().map(|main_fn| Instance::try_from(main_fn).unwrap());
315317
let local_reachable = filter_crate_items(tcx, |_, instance| {

0 commit comments

Comments
 (0)