Merge pull request #1966 from JohnDumbell/JohnDumbell/Update-Assertion-Validation

Increase AssertionError arguments allowed from 2 to 3

Author: kroening

regression/cbmc-java/assertion_error_constructors/AssertionIssue.class

@@ -0,0 +1,13 @@
+public class AssertionIssue {
+
+    public static void throwAssertion() {
+        throw new AssertionError("Something went terribly wrong.", new ThrowableAssertion());
+    }
+
+    public static class ThrowableAssertion extends Throwable {
+        @Override
+        public String getMessage() {
+            return "How did we get here?";
+        }
+    }
+}

regression/cbmc-java/assertion_error_constructors/AssertionIssue.java

@@ -0,0 +1,8 @@
+CORE
+AssertionIssue.class
+--function AssertionIssue.throwAssertion
+^EXIT=10$
+^SIGNAL=0$
+^VERIFICATION FAILED$
+--
+^warning: ignoring

regression/cbmc-java/assertion_error_constructors/test.desc

@@ -969,11 +969,11 @@ void goto_convertt::do_function_call_symbol(
 
     copy(function_call, FUNCTION_CALL, dest);
 
-    if(arguments.size()!=1 && arguments.size()!=2)
+    if(arguments.size() != 1 && arguments.size() != 2 && arguments.size() != 3)
     {
       error().source_location=function.find_source_location();
       error() << "`" << identifier
-              << "' expected to have one or two arguments" << eom;
+              << "' expected to have one, two or three arguments" << eom;
       throw 0;
     }