Skip to content
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

Fixing crash in proof obligation expression computation #783

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Fixing crash in proof obligation expression computation #783

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
438e395
Fixing crash in proof obligation expression computation because code …
marcoeilers Mar 28, 2024
4da0468
Added sanity check that proof obligations for type subexpressions are…
marcoeilers Mar 28, 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
10 changes: 5 additions & 5 deletions src/main/scala/viper/silver/ast/utility/Expressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ object Expressions {
case _ => NoPosition
}
// Conditions for the current node.
val conds = n match {
val conds: Seq[Exp] = n match {
case f@FieldAccess(rcv, _) => List(NeCmp(rcv, NullLit()(p))(p), FieldAccessPredicate(f, WildcardPerm()(p))(p))
case f: FuncApp => prog.findFunction(f.funcname).pres
case Div(_, q) => List(NeCmp(q, IntLit(0)(p))(p))
Expand All @@ -204,16 +204,16 @@ object Expressions {
// Combine the conditions of the subnodes depending on what node we currently have.
val finalSubConds = n match {
case And(left, _) =>
val Seq(leftConds, rightConds) = nonTrivialSubConds
val Seq(leftConds, rightConds, Seq()) = nonTrivialSubConds
reduceAndProofObs(left, leftConds, rightConds, p)
case Implies(left, _) =>
val Seq(leftConds, rightConds) = nonTrivialSubConds
val Seq(leftConds, rightConds, Seq()) = nonTrivialSubConds
reduceImpliesProofObs(left, leftConds, rightConds, p)
case Or(left, _) =>
val Seq(leftConds, rightConds) = nonTrivialSubConds
val Seq(leftConds, rightConds, Seq()) = nonTrivialSubConds
reduceOrProofObs(left, leftConds, rightConds, p)
case CondExp(cond, _, _) =>
val Seq(condConds, thenConds, elseConds, _) = nonTrivialSubConds
val Seq(condConds, thenConds, elseConds, Seq()) = nonTrivialSubConds
reduceCondExpProofObs(cond, condConds, thenConds, elseConds, p)
case _ => subConds.flatten
}
Expand Down
Loading