Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions src/main/scala/viper/carbon/CarbonVerifier.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

package viper.carbon

import boogie.{BoogieModelTransformer, Namespace}
import boogie.{BoogieModelTransformer, CarbonExtendedCounterexample, Namespace}
import modules.impls._
import viper.silver.ast.{MagicWand, Program, Quasihavoc, Quasihavocall}
import viper.silver.utility.Paths
import viper.silver.verifier._
import verifier.{BoogieDependency, BoogieInterface, Verifier}

import java.io.{BufferedOutputStream, File, FileOutputStream, IOException}
import viper.silver.frontend.{MissingDependencyException, NativeModel, VariablesModel}
import viper.silver.frontend.{ExtendedModel, IntermediateModel, MissingDependencyException, NativeModel, VariablesModel}
import viper.silver.reporter.Reporter

/**
Expand Down Expand Up @@ -177,9 +177,13 @@ case class CarbonVerifier(override val reporter: Reporter,
heapModule.enableAllocationEncoding = config == null || !config.disableAllocEncoding.isSupplied // NOTE: config == null happens on the build server / via sbt test

var transformNames = false
var intermediateCounterexample = false
var extendedCounterexample = true
if (config == null) Seq() else config.counterexample.toOption match {
case Some(NativeModel) =>
case Some(VariablesModel) => transformNames = true
case Some(IntermediateModel) => intermediateCounterexample = true
case Some(ExtendedModel) => extendedCounterexample = true
case None =>
case Some(v) => sys.error("Invalid option: " + v)
}
Expand Down Expand Up @@ -243,6 +247,12 @@ case class CarbonVerifier(override val reporter: Reporter,
case Failure(errors) if transformNames => {
errors.foreach(e => BoogieModelTransformer.transformCounterexample(e, translatedNames))
}
case Failure(errors) if intermediateCounterexample => {
errors.foreach(e => CarbonExtendedCounterexample.transformInteremdiateCounterexample(e, translatedNames, program, wandModule.lazyWandToShapes))
}
case Failure(errors) if extendedCounterexample => {
errors.foreach(e => CarbonExtendedCounterexample.transformExtendedCounterexample(e, translatedNames, program, wandModule.lazyWandToShapes))
}
case _ => result
}
result
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package viper.carbon.boogie

import viper.carbon.verifier.FailureContextImpl
import viper.silver.verifier.{AbstractError, Counterexample, FailureContext, Model, ModelEntry, SimpleCounterexample, VerificationError}
import viper.silver.verifier.{AbstractError, Model, ModelEntry, SimpleCounterexample, VerificationError}

import scala.collection.mutable

Expand All @@ -14,9 +14,9 @@ object BoogieModelTransformer {
* Adds a counterexample to the given error if one is available.
*/
def transformCounterexample(e: AbstractError, names: Map[String, Map[String, String]]) : Unit = {
if (e.isInstanceOf[VerificationError] && ErrorMemberMapping.mapping.contains(e.asInstanceOf[VerificationError])){
if (e.isInstanceOf[VerificationError] && ErrorMemberMapping.mapping.contains(e.asInstanceOf[VerificationError].readableMessage(true, true))){
val ve = e.asInstanceOf[VerificationError]
val methodName = ErrorMemberMapping.mapping.get(ve).get.name
val methodName = ErrorMemberMapping.mapping.get(ve.readableMessage(true, true)).get.name
val namesInMember = names.get(methodName).get.map(e => e._2 -> e._1)
val originalEntries = ve.failureContexts(0).counterExample.get.model.entries

Expand Down
Loading
Loading