dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarAction2: Fix procedure calls being incorrectly eliminated

Browse Source 
In the case where they were only referenced by substitution candidates
This commit is contained in:
Jonathan G Rennison
2024-02-01 18:17:04 +00:00
parent 000ae23eb2
commit 47393b42dc
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf_optimiser.cpp
View File

@@ -3071,6 +3071,17 @@ static std::bitset<256> HandleVarAction2DeadStoreElimination(DeterministicSprite
if (may_remove && anno->unskippable) may_remove = false; if (may_remove && anno->unskippable) may_remove = false;
if (may_remove && (anno->stores & all_bits).any()) may_remove = false; if (may_remove && (anno->stores & all_bits).any()) may_remove = false;
if (may_remove) {
for (size_t j = 0; j < substitution_candidates.size(); j++) {
if (anno->stores[substitution_candidates[j] & 0xFF]) {
/* The procedure makes a store which may be used by a later substitution candidate.
* The procedure can't be removed, the substitution candidate will be removed below. */
may_remove = false;
break;
}
}
}
if (may_remove) { if (may_remove) {
if ((i + 1 < (int)group->adjusts.size() && group->adjusts[i + 1].operation == DSGA_OP_RST && group->adjusts[i + 1].variable != 0x7B) || if ((i + 1 < (int)group->adjusts.size() && group->adjusts[i + 1].operation == DSGA_OP_RST && group->adjusts[i + 1].variable != 0x7B) ||
(i + 1 == (int)group->adjusts.size() && group->ranges.empty() && !group->calculated_result)) { (i + 1 == (int)group->adjusts.size() && group->ranges.empty() && !group->calculated_result)) {