Skip to content

JBMC: CProver.getCurrentThreadID:()I conversion fix #2561

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
Jul 8, 2018
Merged

JBMC: CProver.getCurrentThreadID:()I conversion fix #2561

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9059be7
JBMC: CProver.getCurrentThreadID:()I conversion fix
Degiorgio Jul 8, 2018
4a8dc96
JBMC: removed camel-casing from function identifiers
Degiorgio Jul 8, 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
2 changes: 1 addition & 1 deletion jbmc/regression/jbmc-concurrency/get-current-thread/test.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CORE
A.class
--function 'A.me:()V' --java-threading --cp `../../../../scripts/format_classpath.sh . ../../../src/java_bytecode/library/core-models.jar`
--function 'A.me:()V' --java-threading --cp `../../../../scripts/format_classpath.sh . ../../../src/java_bytecode/library/core-models.jar` --lazy-methods
^EXIT=0$
^SIGNAL=0$
^VERIFICATION SUCCESSFUL
4 changes: 2 additions & 2 deletions jbmc/src/java_bytecode/java_bytecode_concurrency_instrumentation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ static void instrument_start_thread(
static void instrument_endThread(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised to find camelCase identifiers in the code base. Maybe fix those in a separate commit.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I agree: this is about instrumenting Java methods of that name, hence seems ok to me?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tautschnig this was the idea, but it's execution lacked consistency as 'instrument_start_thread' does not follow this style. For sake of consistency and to follow code guide-lines, will fix by removing camelCase.

const code_function_callt &f_code,
codet &code,
symbol_tablet symbol_table)
const symbol_tablet &symbol_table)
{
PRECONDITION(f_code.arguments().size() == 1);

Expand Down Expand Up @@ -391,7 +391,7 @@ static void instrument_endThread(
static void instrument_getCurrentThreadID(
const code_function_callt &f_code,
codet &code,
symbol_tablet symbol_table)
symbol_tablet &symbol_table)
{
PRECONDITION(f_code.arguments().size() == 0);

Expand Down