Skip to content

Upgrade toolchain to nightly-2024-11-11 #3710

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
qinheping merged 8 commits into from
Nov 13, 2024
Merged

Upgrade toolchain to nightly-2024-11-11 #3710

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd17757
Upgrade toolchain to nightly-2024-11-11
qinheping Nov 11, 2024
e6e5f29
Update codegen coverage
qinheping Nov 12, 2024
004a956
Update coverage tests
qinheping Nov 12, 2024
39b18bb
Merge branch 'main' into toolchain
qinheping Nov 12, 2024
28de242
Use stable_mir span to get filename directly
qinheping Nov 12, 2024
cc74a99
Merge branch 'main' into toolchain
qinheping Nov 12, 2024
4a06cdf
Use stable_mir span from body_span
qinheping Nov 13, 2024
65f6d2e
Fix format
qinheping Nov 13, 2024
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
3 changes: 2 additions & 1 deletion kani-compiler/src/codegen_cprover_gotoc/codegen/assert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,14 @@ impl GotocCtx<'_> {
counter_data: &str,
span: SpanStable,
source_region: SourceRegion,
file_name: &str,
) -> Stmt {
let loc = self.codegen_caller_span_stable(span);
// Should use Stmt::cover, but currently this doesn't work with CBMC
// unless it is run with '--cover cover' (see
// https://github.com/diffblue/cbmc/issues/6613). So for now use
// `assert(false)`.
let msg = format!("{counter_data} - {source_region:?}");
let msg = format!("{counter_data} - {file_name}:{source_region:?}");
self.codegen_assert(Expr::bool_false(), PropertyClass::CodeCoverage, &msg, loc)
}

Expand Down
3 changes: 2 additions & 1 deletion kani-compiler/src/codegen_cprover_gotoc/codegen/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,9 @@ impl GotocCtx<'_> {
let maybe_source_region =
region_from_coverage_opaque(self.tcx, &coverage_opaque, instance);
if let Some(source_region) = maybe_source_region {
let file_name = format!("{:?}", stmt.span.get_filename());
let coverage_stmt =
self.codegen_coverage(&counter_data, stmt.span, source_region);
self.codegen_coverage(&counter_data, stmt.span, source_region, &file_name);
// TODO: Avoid single-statement blocks when conversion of
// standalone statements to the irep format is fixed.
// More details in <https://github.com/model-checking/kani/issues/3012>
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# SPDX-License-Identifier: Apache-2.0 OR MIT

[toolchain]
channel = "nightly-2024-11-09"
channel = "nightly-2024-11-11"
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]
2 changes: 1 addition & 1 deletion tests/coverage/assert/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
10| 1| if x < 3 ```{'''\
11| 0| ``` // unreachable'''\
12| 0| ``` assert!(x == 2);'''\
13| 0| ``` }'''``` '''\
13| 0| ``` ```}''''''\
14| 1| } else {\
15| 1| // passes\
16| 1| assert!(x <= 5);\
Expand Down
2 changes: 1 addition & 1 deletion tests/coverage/known_issues/assert_uncovered_end/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
10| 1| let x: u32 = kani::any_where(|val| *val == 5);\
11| 1| if x > 3 {\
12| 1| assert!(x > 4);\
13| 1| }``` '''\
13| 1| ```}'''\
14| | }\