Skip to content

Increase AssertionError arguments allowed from 2 to 3 #1966

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
merged 3 commits into from
Apr 24, 2018
Merged

Increase AssertionError arguments allowed from 2 to 3 #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c14e907
Increase AssertionError arguments allowed from 2 to 3
JohnDumbell Mar 23, 2018
eea76ec
Add a regression test.
JohnDumbell Apr 11, 2018
97d556e
Update desc file to add pass variables.
JohnDumbell Apr 11, 2018
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
Binary file added regression/cbmc-java/assertion_error_constructors/AssertionIssue.class
View file
Open in desktop
Binary file not shown.
13 changes: 13 additions & 0 deletions regression/cbmc-java/assertion_error_constructors/AssertionIssue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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?";
}
}
}
8 changes: 8 additions & 0 deletions regression/cbmc-java/assertion_error_constructors/test.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
CORE
AssertionIssue.class
--function AssertionIssue.throwAssertion
^EXIT=10$
^SIGNAL=0$
^VERIFICATION FAILED$
--
^warning: ignoring
4 changes: 2 additions & 2 deletions src/goto-programs/builtin_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down