Skip to content

Enable Monitor exceptions #11

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 2 commits into from
Nov 17, 2018
+7 −4
Merged

Enable Monitor exceptions #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2dd5b8
Enable Monitor entry exception
peterschrammel Nov 11, 2018
436b272
Fix typo
peterschrammel Nov 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
11 changes: 7 additions & 4 deletions src/main/java/java/lang/Object.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public final void wait() throws InterruptedException {
protected void finalize() throws Throwable { }

/**
* This method is not present in the original Objecct class.
* This method is not present in the original Object class.
* It will be called by JBMC when the monitor in this instance
* is being acquired as a result of either the execution of a
* monitorenter bytecode instruction or the call to a synchronized
Expand All @@ -122,8 +122,8 @@ public static void monitorenter(Object object)
{
//FIXME: we shoud remove the call to this method from the call
// stack appended to the thrown exception
// if (object == null)
// throw new NullPointerException();
if (object == null)
throw new NullPointerException();

CProver.atomicBegin();
// this assume blocks this execution path in JBMC and simulates
Expand All @@ -134,7 +134,7 @@ public static void monitorenter(Object object)
}

/**
* This method is not present in the original Objecct class.
* This method is not present in the original Object class.
* It will be called by JBMC when the monitor in this instance
* is being released as a result of either the execution of a
* monitorexit bytecode instruction or the return (normal or exceptional)
Expand All @@ -145,6 +145,9 @@ public static void monitorexit(Object object)
{
//FIXME: we shoud remove the call to this method from the call
// stack appended to the thrown exception
// FIXME: Enabling these exceptions makes
// jbmc-regression/synchronized-blocks/test_sync.desc
// run into an infinite loop during symex
// if (object == null)
// throw new NullPointerException();

Expand Down