Merge

3 files changed, 122 insertions, 80 deletions

diff --git a/Source/BoogieDriver/BoogieDriver.cs b/Source/BoogieDriver/BoogieDriver.cs
index 26763f95..99e9ee9e 100644
--- a/Source/BoogieDriver/BoogieDriver.cs
+++ b/Source/BoogieDriver/BoogieDriver.cs
@@ -520,94 +520,132 @@ namespace Microsoft.Boogie {
           if (CommandLineOptions.Clo.vcVariety == CommandLineOptions.VCVariety.Doomed) {

             Inform(String.Format("{0}doomed", timeIndication));

             errorCount++;

-          } //else {

+          }

           Contract.Assert(errors != null);  // guaranteed by postcondition of VerifyImplementation

+          break;

+      }

+      if (errors != null)      

+      {

+        // BP1xxx: Parsing errors

+        // BP2xxx: Name resolution errors

+        // BP3xxx: Typechecking errors

+        // BP4xxx: Abstract interpretation errors (Is there such a thing?)

+        // BP5xxx: Verification errors

+

+        var cause = "Error";

+        if (outcome == VCGen.Outcome.TimedOut)

+        {

+          cause = "Timed out on";

+        }

+        else if (outcome == VCGen.Outcome.OutOfMemory)

+        {

+          cause = "Out of memory on";

+        }

+        // TODO(wuestholz): Take the error cause into account when writing to the XML sink.

 

+        errors.Sort(new CounterexampleComparer());

+        foreach (Counterexample error in errors)

+        {

+          if (error is CallCounterexample)

+          {

+            CallCounterexample err = (CallCounterexample)error;

+            if (!CommandLineOptions.Clo.ForceBplErrors && err.FailingRequires.ErrorMessage != null)

+            {

+              ReportBplError(err.FailingRequires, err.FailingRequires.ErrorMessage, true, false);

+            }

+            else

+            {

+              ReportBplError(err.FailingCall, cause + " BP5002: A precondition for this call might not hold.", true, true);

+              ReportBplError(err.FailingRequires, "Related location: This is the precondition that might not hold.", false, true);

+            }

+            if (CommandLineOptions.Clo.XmlSink != null)

+            {

+              CommandLineOptions.Clo.XmlSink.WriteError("precondition violation", err.FailingCall.tok, err.FailingRequires.tok, error.Trace);

+            }

+          }

+          else if (error is ReturnCounterexample)

+          {

+            ReturnCounterexample err = (ReturnCounterexample)error;

+            if (!CommandLineOptions.Clo.ForceBplErrors && err.FailingEnsures.ErrorMessage != null)

+            {

+              ReportBplError(err.FailingEnsures, err.FailingEnsures.ErrorMessage, true, false);

+            }

+            else

+            {

+              ReportBplError(err.FailingReturn, cause + " BP5003: A postcondition might not hold on this return path.", true, true);

+              ReportBplError(err.FailingEnsures, "Related location: This is the postcondition that might not hold.", false, true);

+            }

+            if (CommandLineOptions.Clo.XmlSink != null)

+            {

+              CommandLineOptions.Clo.XmlSink.WriteError("postcondition violation", err.FailingReturn.tok, err.FailingEnsures.tok, error.Trace);

+            }

+          }

+          else // error is AssertCounterexample

+          {

+            AssertCounterexample err = (AssertCounterexample)error;

+            if (err.FailingAssert is LoopInitAssertCmd)

+            {

+              ReportBplError(err.FailingAssert, cause + " BP5004: This loop invariant might not hold on entry.", true, true);

+              if (CommandLineOptions.Clo.XmlSink != null)

               {

-            // BP1xxx: Parsing errors

-            // BP2xxx: Name resolution errors

-            // BP3xxx: Typechecking errors

-            // BP4xxx: Abstract interpretation errors (Is there such a thing?)

-            // BP5xxx: Verification errors

-

-            errors.Sort(new CounterexampleComparer());

-            foreach (Counterexample error in errors) {

-              if (error is CallCounterexample) {

-                CallCounterexample err = (CallCounterexample)error;

-                if (!CommandLineOptions.Clo.ForceBplErrors && err.FailingRequires.ErrorMessage != null) {

-                  ReportBplError(err.FailingRequires, err.FailingRequires.ErrorMessage, true, false);

-                }

-                else {

-                  ReportBplError(err.FailingCall, "Error BP5002: A precondition for this call might not hold.", true, true);

-                  ReportBplError(err.FailingRequires, "Related location: This is the precondition that might not hold.", false, true);

-                }

-                if (CommandLineOptions.Clo.XmlSink != null) {

-                  CommandLineOptions.Clo.XmlSink.WriteError("precondition violation", err.FailingCall.tok, err.FailingRequires.tok, error.Trace);

-                }

+                CommandLineOptions.Clo.XmlSink.WriteError("loop invariant entry violation", err.FailingAssert.tok, null, error.Trace);

               }

-              else if (error is ReturnCounterexample) {

-                ReturnCounterexample err = (ReturnCounterexample)error;

-                if (!CommandLineOptions.Clo.ForceBplErrors && err.FailingEnsures.ErrorMessage != null) {

-                  ReportBplError(err.FailingEnsures, err.FailingEnsures.ErrorMessage, true, false);

-                }

-                else {

-                  ReportBplError(err.FailingReturn, "Error BP5003: A postcondition might not hold on this return path.", true, true);

-                  ReportBplError(err.FailingEnsures, "Related location: This is the postcondition that might not hold.", false, true);

-                }

-                if (CommandLineOptions.Clo.XmlSink != null) {

-                  CommandLineOptions.Clo.XmlSink.WriteError("postcondition violation", err.FailingReturn.tok, err.FailingEnsures.tok, error.Trace);

-                }

+            }

+            else if (err.FailingAssert is LoopInvMaintainedAssertCmd)

+            {

+              // this assertion is a loop invariant which is not maintained

+              ReportBplError(err.FailingAssert, cause + " BP5005: This loop invariant might not be maintained by the loop.", true, true);

+              if (CommandLineOptions.Clo.XmlSink != null)

+              {

+                CommandLineOptions.Clo.XmlSink.WriteError("loop invariant maintenance violation", err.FailingAssert.tok, null, error.Trace);

               }

-              else // error is AssertCounterexample

-                    {

-                AssertCounterexample err = (AssertCounterexample)error;

-                if (err.FailingAssert is LoopInitAssertCmd) {

-                  ReportBplError(err.FailingAssert, "Error BP5004: This loop invariant might not hold on entry.", true, true);

-                  if (CommandLineOptions.Clo.XmlSink != null) {

-                    CommandLineOptions.Clo.XmlSink.WriteError("loop invariant entry violation", err.FailingAssert.tok, null, error.Trace);

-                  }

-                }

-                else if (err.FailingAssert is LoopInvMaintainedAssertCmd) {

-                  // this assertion is a loop invariant which is not maintained

-                  ReportBplError(err.FailingAssert, "Error BP5005: This loop invariant might not be maintained by the loop.", true, true);

-                  if (CommandLineOptions.Clo.XmlSink != null) {

-                    CommandLineOptions.Clo.XmlSink.WriteError("loop invariant maintenance violation", err.FailingAssert.tok, null, error.Trace);

-                  }

-                }

-                else {

-                  if (!CommandLineOptions.Clo.ForceBplErrors && err.FailingAssert.ErrorMessage != null) {

-                    ReportBplError(err.FailingAssert, err.FailingAssert.ErrorMessage, true, false);

-                  }

-                  else if (err.FailingAssert.ErrorData is string) {

-                    ReportBplError(err.FailingAssert, (string)err.FailingAssert.ErrorData, true, true);

-                  }

-                  else {

-                    ReportBplError(err.FailingAssert, "Error BP5001: This assertion might not hold.", true, true);

-                  }

-                  if (CommandLineOptions.Clo.XmlSink != null) {

-                    CommandLineOptions.Clo.XmlSink.WriteError("assertion violation", err.FailingAssert.tok, null, error.Trace);

-                  }

-                }

+            }

+            else

+            {

+              if (!CommandLineOptions.Clo.ForceBplErrors && err.FailingAssert.ErrorMessage != null)

+              {

+                ReportBplError(err.FailingAssert, err.FailingAssert.ErrorMessage, true, false);

               }

-              if (CommandLineOptions.Clo.EnhancedErrorMessages == 1) {

-                foreach (string info in error.relatedInformation) {

-                  Contract.Assert(info != null);

-                  Console.WriteLine("       " + info);

-                }

+              else if (err.FailingAssert.ErrorData is string)

+              {

+                ReportBplError(err.FailingAssert, (string)err.FailingAssert.ErrorData, true, true);

               }

-              if (CommandLineOptions.Clo.ErrorTrace > 0) {

-                Console.WriteLine("Execution trace:");

-                error.Print(4);

+              else

+              {

+                ReportBplError(err.FailingAssert, cause + " BP5001: This assertion might not hold.", true, true);

               }

-              if (CommandLineOptions.Clo.ModelViewFile != null) {

-                error.PrintModel();

+              if (CommandLineOptions.Clo.XmlSink != null)

+              {

+                CommandLineOptions.Clo.XmlSink.WriteError("assertion violation", err.FailingAssert.tok, null, error.Trace);

               }

-              errorCount++;

             }

-            //}

-            Inform(String.Format("{0}error{1}", timeIndication, errors.Count == 1 ? "" : "s"));

           }

-              break;

+          if (CommandLineOptions.Clo.EnhancedErrorMessages == 1)

+          {

+            foreach (string info in error.relatedInformation)

+            {

+              Contract.Assert(info != null);

+              Console.WriteLine("       " + info);

+            }

+          }

+          if (CommandLineOptions.Clo.ErrorTrace > 0)

+          {

+            Console.WriteLine("Execution trace:");

+            error.Print(4);

+          }

+          if (CommandLineOptions.Clo.ModelViewFile != null)

+          {

+            error.PrintModel();

+          }

+          if (cause == "Error")

+          {

+            errorCount++;

+          }

+        }

+        if (cause == "Error")

+        {

+          Inform(String.Format("{0}error{1}", timeIndication, errors.Count == 1 ? "" : "s"));

+        }

       }

     }

 

diff --git a/Source/Provers/SMTLib/ProverInterface.cs b/Source/Provers/SMTLib/ProverInterface.cs
index d91ca010..de9be1b9 100644
--- a/Source/Provers/SMTLib/ProverInterface.cs
+++ b/Source/Provers/SMTLib/ProverInterface.cs
@@ -776,7 +776,7 @@ namespace Microsoft.Boogie.SMTLib
           if (globalResult == Outcome.Undetermined)

             globalResult = result;

 

-          if (result == Outcome.Invalid) {

+          if (result == Outcome.Invalid || result == Outcome.TimeOut || result == Outcome.OutOfMemory) {

             IList<string> xlabels;

             if (CommandLineOptions.Clo.UseLabels) {

               labels = GetLabelsInfo();

@@ -790,7 +790,7 @@ namespace Microsoft.Boogie.SMTLib
             handler.OnModel(xlabels, model);

           }

 

-          if (labels == null || errorsLeft == 0) break;

+          if (labels == null || !labels.Any() || errorsLeft == 0) break;

 

           if (CommandLineOptions.Clo.UseLabels) {

             var negLabels = labels.Where(l => l.StartsWith("@")).ToArray();

@@ -800,6 +800,10 @@ namespace Microsoft.Boogie.SMTLib
               posLabels = Enumerable.Empty<string>();

             var conjuncts = posLabels.Select(s => "(not " + lbl(s) + ")").Concat(negLabels.Select(lbl)).ToArray();

             var expr = conjuncts.Length == 1 ? conjuncts[0] : ("(or " + conjuncts.Concat(" ") + ")");

+            if (!conjuncts.Any())

+            {

+              expr = "false";

+            }

             SendThisVC("(assert " + expr + ")");

             SendThisVC("(check-sat)");

           }

diff --git a/Source/VCGeneration/ConditionGeneration.cs b/Source/VCGeneration/ConditionGeneration.cs
index cabc9d9e..dc9f496b 100644
--- a/Source/VCGeneration/ConditionGeneration.cs
+++ b/Source/VCGeneration/ConditionGeneration.cs
@@ -597,7 +597,7 @@ namespace VC {
 

       CounterexampleCollector collector = new CounterexampleCollector();

       Outcome outcome = VerifyImplementation(impl, collector);

-      if (outcome == Outcome.Errors) {

+      if (outcome == Outcome.Errors || outcome == Outcome.TimedOut || outcome == Outcome.OutOfMemory) {

         errors = collector.examples;

       } else {

         errors = null;