alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Work around spurious g++-12 warnings

Browse source 
* spot/twaalgos/ltl2tgba_fm.cc, spot/tl/formula.hh,
spot/twaalgos/translate.cc: Add SPOT_ASSUME in various places to help
g++.
This commit is contained in:
Alexandre Duret-Lutz 2022-12-08 17:27:32 +01:00
parent d0ae0dfc38
commit 16373cfb10
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spot/tl/formula.hh
View file

@ -294,7 +294,9 @@ namespace spot
{ {
if (SPOT_UNLIKELY(i >= size())) if (SPOT_UNLIKELY(i >= size()))
report_non_existing_child(); report_non_existing_child();
return children[i]; const fnode* c = children[i];
SPOT_ASSUME(c != nullptr);
return c;
} }
/// \see formula::ff /// \see formula::ff

15
spot/twaalgos/ltl2tgba_fm.cc
View file

@ -1026,11 +1026,16 @@ namespace spot
bool coacc = false; bool coacc = false;
auto& st = sm->states_of(n); auto& st = sm->states_of(n);
for (auto l: st) for (auto l: st)
if (namer->get_name(l).accepts_eword()) {
{ formula lf = namer->get_name(l);
coacc = true; // Somehow gcc 12.2.0 thinks lf can be nullptr.
break; SPOT_ASSUME(lf != nullptr);
} if (lf.accepts_eword())
{
coacc = true;
break;
}
}
if (!coacc) if (!coacc)
{ {
// ... or if any of its successors is coaccessible. // ... or if any of its successors is coaccessible.

9
spot/twaalgos/translate.cc
View file

@ -209,9 +209,12 @@ namespace spot
if (!rest.empty() && !oblg.empty()) if (!rest.empty() && !oblg.empty())
{ {
auto safety = [](formula f) auto safety = [](formula f)
{ {
return f.is_syntactic_safety(); // Prevent gcc 12.2.0 from warning us that f could be a
}; // nullptr formula.
SPOT_ASSUME(f != nullptr);
return f.is_syntactic_safety();
};
auto i = std::remove_if(oblg.begin(), oblg.end(), safety); auto i = std::remove_if(oblg.begin(), oblg.end(), safety);
rest.insert(rest.end(), i, oblg.end()); rest.insert(rest.end(), i, oblg.end());
oblg.erase(i, oblg.end()); oblg.erase(i, oblg.end());