Skip to content

goto-cc no longer uses language_uit#2980

Merged
tautschnig merged 7 commits intodevelopfrom
goto-cc-language-ui
Sep 19, 2018
Merged

goto-cc no longer uses language_uit#2980
tautschnig merged 7 commits intodevelopfrom
goto-cc-language-ui

Conversation

@kroening
Copy link
Collaborator

@kroening kroening commented Sep 18, 2018 •
edited by tautschnig
Loading

language_uit is getting phased out; goto-cc, as a command-line tool, as never used any of its functionality.

  • Each commit message has a non-empty body, explaining why the change was made.
  • My contribution is formatted in line with CODING_STANDARD.md.
  • Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • White-space or formatting changes outside the feature-related changed lines are in commits of their own.

peterschrammel
peterschrammel approved these changes Sep 18, 2018
View reviewed changes
Copy link
Member

@peterschrammel peterschrammel left a comment

Choose a reason for hiding this comment

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

LGTM modulo CI passing

src/goto-cc/compile.cpp Outdated
// Parse command line for source and object file names
for(std::size_t i=0; i<_cmdline.args.size(); i++)
if(add_input_file(_cmdline.args[i]))
for(std::size_t i = 0; i < cmdline.args.size(); i++)
Copy link
Member

@peterschrammel peterschrammel Sep 18, 2018

Choose a reason for hiding this comment

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

ranged for?

Copy link
Collaborator Author

@kroening kroening Sep 18, 2018

Choose a reason for hiding this comment

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

Ok, will throw that in as separate commit.

@tautschnig tautschnig removed their assignment Sep 18, 2018
allredj
allredj reviewed Sep 18, 2018
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

Passed Diffblue compatibility checks (cbmc commit: 3fd8192).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/85174377

@peterschrammel
Copy link
Member

peterschrammel commented Sep 18, 2018

@tautschnig, please review so that we can rebase #2434.

@kroening kroening mentioned this pull request Sep 18, 2018
Merged
allredj
allredj reviewed Sep 18, 2018
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

Passed Diffblue compatibility checks (cbmc commit: 82c70bb).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/85180022

allredj
allredj reviewed Sep 18, 2018
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

Passed Diffblue compatibility checks (cbmc commit: 75b5d51).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/85181132

tautschnig
tautschnig reviewed Sep 18, 2018
View reviewed changes
src/goto-cc/compile.cpp
// we just typecheck one file here
if(language_files.typecheck(symbol_table))
{
error() << "CONVERSION ERROR" << eom;
Copy link
Collaborator

@tautschnig tautschnig Sep 18, 2018

Choose a reason for hiding this comment

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

Doesn't typecheck also print the "CONVERSION ERROR" message?

Copy link
Collaborator Author

@kroening kroening Sep 19, 2018

Choose a reason for hiding this comment

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

No; that's either the language_ui code (getting replaced here) or the two generators of goto_models in goto-programs.

src/goto-cc/compile.cpp

if((has_suffix(file_name, ".class") ||
has_suffix(file_name, ".jar")) &&
final())
Copy link
Collaborator

@tautschnig tautschnig Sep 18, 2018

Choose a reason for hiding this comment

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

This got silently lost.

Copy link
Collaborator Author

@kroening kroening Sep 18, 2018

Choose a reason for hiding this comment

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

Ok, put into separate commit

tautschnig
tautschnig approved these changes Sep 19, 2018
View reviewed changes
Copy link
Collaborator

@tautschnig tautschnig left a comment

Choose a reason for hiding this comment

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

This should likely have been 3-4 PRs, but that's probably obvious to everyone involved.

@tautschnig
Copy link
Collaborator

tautschnig commented Sep 19, 2018

The CI failure appears to be a problem in the most recent version of the Google Cloud SDK. I have filed https://issuetracker.google.com/issues/116076881.

@tautschnig
Copy link
Collaborator

tautschnig commented Sep 19, 2018

Will need to be rebased on #2986 has been merged to make CI pass.

@tautschnig
Copy link
Collaborator

tautschnig commented Sep 19, 2018

#2986 has been merged, a rebase should make CI pass.

@kroening
Copy link
Collaborator Author

kroening commented Sep 19, 2018

@tautschnig Yes, agreed, this could have been multiple PRs; the key pain point here is lack of dependency tracking: the commits in this PR are all very dependent.

@tautschnig tautschnig merged commit 0c21f1c into develop Sep 19, 2018
@tautschnig tautschnig deleted the goto-cc-language-ui branch September 19, 2018 19:36
allredj
allredj reviewed Sep 19, 2018
View reviewed changes
Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

Passed Diffblue compatibility checks (cbmc commit: e33fbc8).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/85335858

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tautschnig tautschnig tautschnig approved these changes

@peterschrammel peterschrammel peterschrammel approved these changes

@pkesseli pkesseli Awaiting requested review from pkesseli

@smowton smowton Awaiting requested review from smowton

+1 more reviewer

@allredj allredj allredj left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@kroening kroening

Labels

cleanup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kroening @peterschrammel @tautschnig @allredj