Skip to content
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

Remove some logically dead code #9424

Merged
merged 2 commits into from Jul 10, 2021
Merged

Remove some logically dead code #9424

merged 2 commits into from Jul 10, 2021

Conversation

@rubidium42
Copy link
Contributor

@rubidium42 rubidium42 commented Jul 10, 2021

Motivation / Problem

From coverity: Logically dead code. The indicated dead code may have performed some action; that action will never occur.

  • In FreeTypeFontCache::​InternalGetGlyph(unsigned int, bool): Code can never be reached because of a logical contradiction (CWE-561)
  • In PaymentRatesGraphWindow::​DrawWidget(Rect const&, int): Code can never be reached because of a logical contradiction (CWE-561)

Description

Practically in a branch of if (expr) any ternary that looks like expr ? A : B can be collapsed to A as expr is known to be true at that point. Note that in some of the cases it's more like if (!expr) with expr ? A : B, so B is chosen there.

Limitations

None.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')
rubidium42 added 2 commits Jul 10, 2021
The outer if statement checks for 'aa' being false, so within the inner
statements anything checking aa will have a known result and the other
branch from there will be dead code.
@rubidium42 rubidium42 merged commit 85faa21 into OpenTTD:master Jul 10, 2021
14 checks passed
Loading
@rubidium42 rubidium42 deleted the dead_code branch Jul 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants