Skip to content

Do not shadow the class member return_type [blocks: #2310] #3358

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

Jump to bottom
Merged
kroening merged 1 commit into from
Nov 11, 2018
Merged

Do not shadow the class member return_type [blocks: #2310] #3358

kroening merged 1 commit into from
Nov 11, 2018

Conversation

@tautschnig
Copy link
Collaborator

@tautschnig tautschnig commented Nov 11, 2018

Using the very short variable name "r" to make clear this is only of very local
use instead.

  • Each commit message has a non-empty body, explaining why the change was made.
  • n/a 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).
  • n/a My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • n/a White-space or formatting changes outside the feature-related changed lines are in commits of their own.

@tautschnig tautschnig requested a review from kroening as a code owner November 11, 2018 14:25
peterschrammel
peterschrammel approved these changes Nov 11, 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.

A few naming suggestions

src/ansi-c/c_typecheck_expr.cpp Outdated
code_function_callt &fc=to_code_function_call(last);

const auto &return_type = to_code_type(fc.function().type()).return_type();
const auto &r = to_code_type(fc.function().type()).return_type();
Copy link
Member

@peterschrammel peterschrammel Nov 11, 2018

Choose a reason for hiding this comment

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

Suggestions: return_type_ref, call_return_type ?

Copy link
Collaborator Author

@tautschnig tautschnig Nov 11, 2018

Choose a reason for hiding this comment

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

I have just removed the temporary instead.

src/ansi-c/c_typecheck_expr.cpp Outdated
// Let's just add it.
// We do a bit of return-type guessing, but just a bit.
typet return_type=signed_int_type();
typet r = signed_int_type();
Copy link
Member

@peterschrammel peterschrammel Nov 11, 2018

Choose a reason for hiding this comment

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

guessed_return_type ?

Copy link
Collaborator Author

@tautschnig tautschnig Nov 11, 2018

Choose a reason for hiding this comment

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

Done.

src/ansi-c/c_typecheck_type.cpp Outdated
// is a function type or an array type."

const typet &return_type=follow(type.return_type());
const typet &r = follow(type.return_type());
Copy link
Member

@peterschrammel peterschrammel Nov 11, 2018

Choose a reason for hiding this comment

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

decl_return_type ?

Copy link
Collaborator Author

@tautschnig tautschnig Nov 11, 2018

Choose a reason for hiding this comment

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

Thanks, done!

@tautschnig
Do not shadow the class member return_type
b490078 
Removed the temporary where it added no value and otherwise renamed it to
descriptive names.
allredj
allredj reviewed Nov 11, 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.

🚫
This PR failed Diffblue compatibility checks (cbmc commit: 028b786).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/90980987
Status will be re-evaluated on next push.
Please contact @peterschrammel, @thk123, or @allredj for support.

Common spurious failures:

  • the cbmc commit has disappeared in the mean time (e.g. in a force-push)
  • the author is not in the list of contributors (e.g. first-time contributors).

The incompatibility may have been introduced by an earlier PR. In that case merging this
PR should be avoided unless it fixes the current incompatibility.

allredj
allredj reviewed Nov 11, 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: b490078).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/90981981

@kroening kroening merged commit 0021562 into diffblue:develop Nov 11, 2018
@tautschnig tautschnig deleted the vs-shadow-9 branch November 11, 2018 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kroening kroening kroening approved these changes

@peterschrammel peterschrammel peterschrammel approved these changes

+1 more reviewer

@allredj allredj allredj left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@kroening kroening

Labels

blocker cleanup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tautschnig @kroening @peterschrammel @allredj