Merge

2 files changed, 6 insertions, 2 deletions

diff --git a/Source/ExecutionEngine/ExecutionEngine.cs b/Source/ExecutionEngine/ExecutionEngine.cs
index acb329ed..b8bdf894 100644
--- a/Source/ExecutionEngine/ExecutionEngine.cs
+++ b/Source/ExecutionEngine/ExecutionEngine.cs
@@ -9,7 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;

 using VC;

 using BoogiePL = Microsoft.Boogie;

-

+using System.Diagnostics;

 

 namespace Microsoft.Boogie

 {

@@ -931,7 +931,6 @@ namespace Microsoft.Boogie
       return outcome;

     }

 

-

     public static void CancelRequest(string requestId)

     {

       Contract.Requires(requestId != null);

diff --git a/Source/Predication/UniformityAnalyser.cs b/Source/Predication/UniformityAnalyser.cs
index a76566e4..3d6b7b18 100644
--- a/Source/Predication/UniformityAnalyser.cs
+++ b/Source/Predication/UniformityAnalyser.cs
@@ -422,6 +422,11 @@ namespace Microsoft.Boogie
 

         public bool IsUniform(string procedureName, Expr expr)

         {

+            if (!uniformityInfo.ContainsKey(procedureName))

+            {

+                return false;

+            }

+

             UniformExpressionAnalysisVisitor visitor = new UniformExpressionAnalysisVisitor(uniformityInfo[procedureName].Value);

             visitor.VisitExpr(expr);

             return visitor.IsUniform();