Skip to content

Use #kani_comment instead of #comment for deinit #1708

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

Closed
giltho wants to merge 4 commits into from
Closed

Use #kani_comment instead of #comment for deinit #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5d8630
use with_kani_comment for deinit
giltho Sep 21, 2022
9083ada
Merge branch 'main' into clean-comment
giltho Sep 21, 2022
fc4e8fe
commit missing file
giltho Sep 21, 2022
0462cf4
Merge remote-tracking branch 'upstream/main' into clean-comment
giltho Dec 5, 2022
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
4 changes: 2 additions & 2 deletions cprover_bindings/src/irep/irep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ impl Irep {
/// Adds a `comment` sub to the irep.
/// Note that there might be comments both on the irep itself and
/// inside the location sub of the irep.
pub fn with_comment<T: Into<InternedString>>(self, c: T) -> Self {
self.with_named_sub(IrepId::Comment, Irep::just_string_id(c))
pub fn with_kani_comment<T: Into<InternedString>>(self, c: T) -> Self {
Copy link
Contributor

@danielsn danielsn Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ends up with "kani" stuff inside cprover_bindings. Is there a better way?

Copy link
Contributor Author

@giltho giltho Sep 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.
The only other way is to use a IrepId::FreeformString.

self.with_named_sub(IrepId::KaniComment, Irep::just_string_id(c))
}

pub fn with_named_sub(mut self, key: IrepId, value: Irep) -> Self {
Expand Down
2 changes: 2 additions & 0 deletions cprover_bindings/src/irep/irep_id.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ pub enum IrepId {
Line,
Column,
Comment,
KaniComment,
Property,
PropertyClass,
PropertyId,
Expand Down Expand Up @@ -909,6 +910,7 @@ impl ToString for IrepId {
IrepId::Line => "line",
IrepId::Column => "column",
IrepId::Comment => "comment",
IrepId::KaniComment => "#kani_comment",
IrepId::Property => "property",
IrepId::PropertyClass => "property_class",
IrepId::PropertyId => "property_id",
Expand Down
2 changes: 1 addition & 1 deletion cprover_bindings/src/irep/to_irep.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ impl ToIrep for StmtBody {
// So we translate identically to `nondet` here, but add a comment noting we wish it were poison
// potentially for other backends to pick up and treat specially.
code_irep(IrepId::Assign, vec![place.to_irep(mm), place.typ().nondet().to_irep(mm)])
.with_comment("deinit")
.with_kani_comment("deinit")
}
StmtBody::Expression(e) => code_irep(IrepId::Expression, vec![e.to_irep(mm)]),
StmtBody::For { init, cond, update, body } => code_irep(
Expand Down