Skip to content

Scope for functions, predicates, and methods (of ASTs) #583

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
ArquintL merged 2 commits into from
Dec 7, 2021
Merged

Scope for functions, predicates, and methods (of ASTs) #583

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a72e99
sets scope for functions, predicates, and methods (of ASTs)
ArquintL Dec 6, 2021
32be5f4
fixes CI compilation issues while being backwards compatible
ArquintL Dec 6, 2021
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
16 changes: 12 additions & 4 deletions src/main/scala/verifier/DefaultMasterVerifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import viper.silicon.supporters._
import viper.silicon.supporters.functions.DefaultFunctionVerificationUnitProvider
import viper.silicon.supporters.qps._
import viper.silicon.utils.Counter
import viper.silver.ast.BackendType
import viper.silver.ast.{BackendType, Member}
import viper.silver.ast.utility.rewriter.Traverse
import viper.silver.cfg.silver.SilverCfg
import viper.silver.reporter.{ConfigurationConfirmation, ExecutionTraceReport, Reporter, VerificationResultMessage}
Expand Down Expand Up @@ -194,7 +194,7 @@ class DefaultMasterVerifier(config: Config, override val reporter: Reporter)
val elapsed = System.currentTimeMillis() - startTime
reporter report VerificationResultMessage(s"silicon", function, elapsed, condenseToViperResult(results))
logger debug s"Silicon finished verification of function `${function.name}` in ${viper.silver.reporter.format.formatMillisReadably(elapsed)} seconds with the following result: ${condenseToViperResult(results).toString}"
results
setErrorScope(results, function)
})

val predicateVerificationResults = predicateSupporter.units.toList flatMap (predicate => {
Expand All @@ -203,7 +203,7 @@ class DefaultMasterVerifier(config: Config, override val reporter: Reporter)
val elapsed = System.currentTimeMillis() - startTime
reporter report VerificationResultMessage(s"silicon", predicate, elapsed, condenseToViperResult(results))
logger debug s"Silicon finished verification of predicate `${predicate.name}` in ${viper.silver.reporter.format.formatMillisReadably(elapsed)} seconds with the following result: ${condenseToViperResult(results).toString}"
results
setErrorScope(results, predicate)
})

decider.prover.stop()
Expand Down Expand Up @@ -231,7 +231,7 @@ class DefaultMasterVerifier(config: Config, override val reporter: Reporter)
reporter report VerificationResultMessage(s"silicon", method, elapsed, condenseToViperResult(results))
logger debug s"Silicon finished verification of method `${method.name}` in ${viper.silver.reporter.format.formatMillisReadably(elapsed)} seconds with the following result: ${condenseToViperResult(results).toString}"

results
setErrorScope(results, method)
})
}) ++ cfgs.map(cfg => {
val s = createInitialState(cfg, program)/*.copy(parallelizeBranches = true)*/ /* [BRANCH-PARALLELISATION] */
Expand Down Expand Up @@ -468,4 +468,12 @@ class DefaultMasterVerifier(config: Config, override val reporter: Reporter)
})
}
}

private def setErrorScope(results: Seq[VerificationResult], scope: Member): Seq[VerificationResult] = {
results.foreach {
case f: Failure => f.message.scope = Some(scope)
case _ =>
}
results
}
}
⚡