-
Notifications
You must be signed in to change notification settings - Fork 276
JBMC: Add symex-based program loading #1759
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.
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
smowton
merged 9 commits into
diffblue:develop
from
smowton:smowton/feature/symex-driven-program-loading
Mar 22, 2018
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
890b8b1
Remove exceptions: add per-function entry point
smowton 98741f9
Java frontend: note availability of synthetic methods
smowton 8df9350
Java frontend: rename externally driven loading
smowton 978ca5b
Add callback after symex to bmct
smowton 7b5d73b
JBMC: use symex-driven lazy loading
smowton 8aa38e7
Add tests for symex-driven lazy loading
smowton ccb2cf3
Fix broken test descriptions
smowton 6c79494
Fix broken static_init_order test descriptions
smowton 953e2df
Enable show-properties with symex-driven lazy loading
smowton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,10 @@ | ||
add_test_pl_tests( | ||
"$<TARGET_FILE:jbmc>" | ||
) | ||
|
||
add_test_pl_profile( | ||
"cbmc-java-symex-driven-lazy-loading" | ||
"$<TARGET_FILE:jbmc> --symex-driven-lazy-loading" | ||
"-C;-X;symex-driven-lazy-loading-expected-failure" | ||
"CORE" | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
Test.class | ||
--function Test.check --lazy-methods | ||
^VERIFICATION SUCCESSFUL$ | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
CORE | ||
test.class | ||
|
||
^VERIFICATION SUCCESSFUL$ | ||
-- | ||
^warning: ignoring | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
CORE | ||
test.class | ||
|
||
VERIFICATION SUCCESSFUL | ||
-- | ||
^warning: ignoring | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
edu/emory/mathcs/backport/java/util/concurrent/ConcurrentHashMap.class | ||
--show-goto-functions | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
-- | ||
\\"statement\\" \(\\"jsr\\"\) | ||
\\"statement\\" \(\\"ret\\"\) | ||
-- | ||
This doesn't work under symex-driven lazy loading because no entry-point function is given. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
SymStream.class | ||
--verbosity 10 --show-goto-functions | ||
^EXIT=0 | ||
^SIGNAL=0 | ||
-- | ||
-- | ||
just to test that it doesn't crash in this situation, cf. TG-2684 | ||
Doesn't work with symex-driven loading because there is no entry point (we want to load the entire class) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.main | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::A\.f:\(\)V | ||
-- | ||
elaborate java::B\.g:\(\)V | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,11 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.f --lazy-methods-extra-entry-point test.sety | ||
^EXIT=6$ | ||
^SIGNAL=0$ | ||
entry point 'test\.sety' is ambiguous between: | ||
test\.sety:\(I\)V | ||
test\.sety:\(F\)V | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.main | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::A\.f:\(\)V | ||
-- | ||
elaborate java::B\.g:\(\)V | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.main | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::A\.f:\(\)V | ||
-- | ||
elaborate java::B\.g:\(\)V | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,9 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
Main.class | ||
--lazy-methods | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,9 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --function test.main | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.g | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::test\.f:\(\)I | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.test | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::Base\.f:\(\)V | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
5 changes: 4 additions & 1 deletion
5
regression/cbmc-java/lazyloading_indirect_array_parameter/test.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.g | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::test\.f:\(\)I | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
5 changes: 4 additions & 1 deletion
5
regression/cbmc-java/lazyloading_indirect_generic_array_parameter/test.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.g | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::test\.f:\(\)I | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.test | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::Base\.f:\(\)V | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
5 changes: 4 additions & 1 deletion
5
regression/cbmc-java/lazyloading_multiple_array_types/test.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,11 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
Test.class | ||
--lazy-methods --verbosity 10 --function Test.check | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::A\.f:\(\)I | ||
elaborate java::B\.g:\(\)I | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
5 changes: 4 additions & 1 deletion
5
regression/cbmc-java/lazyloading_multiple_generic_parameters/test.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.g | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::test\.f:\(\)I | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
test.class | ||
--lazy-methods --verbosity 10 --function test.test | ||
^EXIT=0$ | ||
^SIGNAL=0$ | ||
elaborate java::Base\.f:\(\)V | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
2 changes: 1 addition & 1 deletion
2
...ession/cbmc-java/lazyloading_synthetic_method_cleanup1/check_clinit_normally_present.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...cbmc-java/lazyloading_synthetic_method_cleanup1/check_clinit_removed_by_lazy_loading.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
Test.class | ||
--lazy-methods --show-goto-functions --function Test.main | ||
-- | ||
java::Unused::clinit_wrapper | ||
Unused\.<clinit>\(\) | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
5 changes: 4 additions & 1 deletion
5
regression/cbmc-java/lazyloading_synthetic_method_cleanup1/check_runs_with_lazy_loading.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,7 @@ | ||
CORE | ||
CORE symex-driven-lazy-loading-expected-failure | ||
Test.class | ||
--lazy-methods --function Test.main | ||
VERIFICATION SUCCESSFUL | ||
-- | ||
-- | ||
This doesn't work under symex-driven lazy loading because it is incompatible with --lazy-methods |
2 changes: 1 addition & 1 deletion
2
...ession/cbmc-java/lazyloading_synthetic_method_cleanup2/check_clinit_normally_present.desc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably good to add a comment to this
test.desc
explaining why this is an expected failureThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see it is because of the
lazy-methods
flag. I still think they'd benefit from a uniform comment, but you may disagree.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 for having a comment on each of the skipped desc to mention the reason they are skipped.