Skip to content

Commit 7432a14

Browse files
firewavefirewave
committed
ValueFlow: extracted valueFlowEnumValue() into separate file / introduced vf_analyze.h to group all analyze headers
1 parent fa561e9 commit 7432a14

9 files changed

Lines changed: 134 additions & 31 deletions

File tree

‎Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ LIBOBJ = $(libcppdir)/valueflow.o \
252252
$(libcppdir)/token.o \
253253
$(libcppdir)/tokenlist.o \
254254
$(libcppdir)/utils.o \
255+
$(libcppdir)/vf_enumvalue.o \
255256
$(libcppdir)/vfvalue.o
256257

257258
EXTOBJ = externals/simplecpp/simplecpp.o \
@@ -460,7 +461,7 @@ validateRules:
460461

461462
###### Build
462463

463-
$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/forwardanalyzer.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
464+
$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/addoninfo.h lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/findtoken.h lib/forwardanalyzer.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vf_analyze.h lib/vf_enumvalue.h lib/vfvalue.h
464465
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
465466

466467
$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
@@ -646,6 +647,9 @@ $(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/
646647
$(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
647648
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
648649

650+
$(libcppdir)/vf_enumvalue.o: lib/vf_enumvalue.cpp lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_enumvalue.h lib/vfvalue.h
651+
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_enumvalue.cpp
652+
649653
$(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
650654
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
651655

‎lib/cppcheck.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
<ClCompile Include="token.cpp" />
8888
<ClCompile Include="tokenlist.cpp" />
8989
<ClCompile Include="utils.cpp" />
90+
<ClCompile Include="vf_enumvalue.cpp" />
9091
<ClCompile Include="vfvalue.cpp" />
9192
</ItemGroup>
9293
<ItemGroup Label="HeaderFiles">
@@ -166,6 +167,8 @@
166167
<ClInclude Include="valueflow.h" />
167168
<ClInclude Include="valueptr.h" />
168169
<ClInclude Include="version.h" />
170+
<ClInclude Include="vf_analyze.h" />
171+
<ClInclude Include="vf_enumvalue.h" />
169172
<ClInclude Include="vfvalue.h" />
170173
<ClInclude Include="xml.h" />
171174
</ItemGroup>

‎lib/lib.pri‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ HEADERS += $${PWD}/addoninfo.h \
7777
$${PWD}/valueflow.h \
7878
$${PWD}/valueptr.h \
7979
$${PWD}/version.h \
80+
$${PWD}/vf_analyze.h \
81+
$${PWD}/vf_enumvalue.h \
8082
$${PWD}/vfvalue.h \
8183
$${PWD}/xml.h
8284

@@ -142,4 +144,5 @@ SOURCES += $${PWD}/valueflow.cpp \
142144
$${PWD}/token.cpp \
143145
$${PWD}/tokenlist.cpp \
144146
$${PWD}/utils.cpp \
147+
$${PWD}/vf_enumvalue.cpp \
145148
$${PWD}/vfvalue.cpp

‎lib/valueflow.cpp‎

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@
105105
#include "valueptr.h"
106106
#include "vfvalue.h"
107107

108+
#include "vf_analyze.h"
109+
108110
#include <algorithm>
109111
#include <array>
110112
#include <cassert>
@@ -122,6 +124,7 @@
122124
#include <numeric>
123125
#include <set>
124126
#include <sstream>
127+
#include <stdexcept>
125128
#include <string>
126129
#include <type_traits>
127130
#include <unordered_map>
@@ -2045,33 +2048,6 @@ static void valueFlowImpossibleValues(TokenList& tokenList, const Settings& sett
20452048
}
20462049
}
20472050

2048-
static void valueFlowEnumValue(SymbolDatabase & symboldatabase, const Settings & settings)
2049-
{
2050-
for (Scope & scope : symboldatabase.scopeList) {
2051-
if (scope.type != Scope::eEnum)
2052-
continue;
2053-
MathLib::bigint value = 0;
2054-
bool prev_enum_is_known = true;
2055-
2056-
for (Enumerator & enumerator : scope.enumeratorList) {
2057-
if (enumerator.start) {
2058-
auto* rhs = const_cast<Token*>(enumerator.start->previous()->astOperand2());
2059-
ValueFlow::valueFlowConstantFoldAST(rhs, settings);
2060-
if (rhs && rhs->hasKnownIntValue()) {
2061-
enumerator.value = rhs->values().front().intvalue;
2062-
enumerator.value_known = true;
2063-
value = enumerator.value + 1;
2064-
prev_enum_is_known = true;
2065-
} else
2066-
prev_enum_is_known = false;
2067-
} else if (prev_enum_is_known) {
2068-
enumerator.value = value++;
2069-
enumerator.value_known = true;
2070-
}
2071-
}
2072-
}
2073-
}
2074-
20752051
static void valueFlowGlobalConstVar(TokenList& tokenList, const Settings &settings)
20762052
{
20772053
// Get variable values...
@@ -9654,13 +9630,13 @@ void ValueFlow::setValues(TokenList& tokenlist,
96549630

96559631
ValueFlowPassRunner runner{ValueFlowState{tokenlist, symboldatabase, errorLogger, settings}, timerResults};
96569632
runner.run_once({
9657-
VFA(valueFlowEnumValue(symboldatabase, settings)),
9633+
VFA(analyzeEnumValue(symboldatabase, settings)),
96589634
VFA(valueFlowNumber(tokenlist, settings)),
96599635
VFA(valueFlowString(tokenlist, settings)),
96609636
VFA(valueFlowArray(tokenlist, settings)),
96619637
VFA(valueFlowUnknownFunctionReturn(tokenlist, settings)),
96629638
VFA(valueFlowGlobalConstVar(tokenlist, settings)),
9663-
VFA(valueFlowEnumValue(symboldatabase, settings)),
9639+
VFA(analyzeEnumValue(symboldatabase, settings)),
96649640
VFA(valueFlowGlobalStaticVar(tokenlist, settings)),
96659641
VFA(valueFlowPointerAlias(tokenlist, settings)),
96669642
VFA(valueFlowLifetime(tokenlist, errorLogger, settings)),

‎lib/vf_analyze.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Cppcheck - A tool for static C/C++ code analysis
3+
* Copyright (C) 2007-2024 Cppcheck team.
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#ifndef vfAnalyzeH
20+
#define vfAnalyzeH
21+
22+
#include "vf_enumvalue.h" // IWYU pragma: export
23+
24+
#endif // vfAnalyzeH

‎lib/vf_enumvalue.cpp‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
/*
2+
* Cppcheck - A tool for static C/C++ code analysis
3+
* Copyright (C) 2007-2024 Cppcheck team.
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#include "vf_enumvalue.h"
20+
21+
#include "mathlib.h"
22+
#include "symboldatabase.h"
23+
#include "token.h"
24+
#include "valueflow.h"
25+
26+
#include <list>
27+
#include <memory>
28+
#include <vector>
29+
30+
namespace ValueFlow
31+
{
32+
void analyzeEnumValue(SymbolDatabase & symboldatabase, const Settings & settings)
33+
{
34+
for (Scope & scope : symboldatabase.scopeList) {
35+
if (scope.type != Scope::eEnum)
36+
continue;
37+
MathLib::bigint value = 0;
38+
bool prev_enum_is_known = true;
39+
40+
for (Enumerator & enumerator : scope.enumeratorList) {
41+
if (enumerator.start) {
42+
auto* rhs = const_cast<Token*>(enumerator.start->previous()->astOperand2());
43+
valueFlowConstantFoldAST(rhs, settings);
44+
if (rhs && rhs->hasKnownIntValue()) {
45+
enumerator.value = rhs->values().front().intvalue;
46+
enumerator.value_known = true;
47+
value = enumerator.value + 1;
48+
prev_enum_is_known = true;
49+
} else
50+
prev_enum_is_known = false;
51+
} else if (prev_enum_is_known) {
52+
enumerator.value = value++;
53+
enumerator.value_known = true;
54+
}
55+
}
56+
}
57+
}
58+
}

‎lib/vf_enumvalue.h‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Cppcheck - A tool for static C/C++ code analysis
3+
* Copyright (C) 2007-2024 Cppcheck team.
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
19+
#ifndef vfEnumValueH
20+
#define vfEnumValueH
21+
22+
class SymbolDatabase;
23+
class Settings;
24+
25+
namespace ValueFlow
26+
{
27+
void analyzeEnumValue(SymbolDatabase & symboldatabase, const Settings & settings);
28+
}
29+
30+
#endif // vfEnumValueH

‎oss-fuzz/Makefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ LIBOBJ = $(libcppdir)/valueflow.o \
9595
$(libcppdir)/token.o \
9696
$(libcppdir)/tokenlist.o \
9797
$(libcppdir)/utils.o \
98+
$(libcppdir)/vf_enumvalue.o \
9899
$(libcppdir)/vfvalue.o
99100

100101
EXTOBJ = simplecpp.o \
@@ -139,7 +140,7 @@ simplecpp.o: ../externals/simplecpp/simplecpp.cpp ../externals/simplecpp/simplec
139140
tinyxml2.o: ../externals/tinyxml2/tinyxml2.cpp ../externals/tinyxml2/tinyxml2.h
140141
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -w -c -o $@ ../externals/tinyxml2/tinyxml2.cpp
141142

142-
$(libcppdir)/valueflow.o: ../lib/valueflow.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/check.h ../lib/checkuninitvar.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/forwardanalyzer.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/programmemory.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vfvalue.h
143+
$(libcppdir)/valueflow.o: ../lib/valueflow.cpp ../lib/addoninfo.h ../lib/analyzer.h ../lib/astutils.h ../lib/calculate.h ../lib/check.h ../lib/checkuninitvar.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/findtoken.h ../lib/forwardanalyzer.h ../lib/infer.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/programmemory.h ../lib/reverseanalyzer.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/valueptr.h ../lib/vf_analyze.h ../lib/vf_enumvalue.h ../lib/vfvalue.h
143144
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
144145

145146
$(libcppdir)/tokenize.o: ../lib/tokenize.cpp ../externals/simplecpp/simplecpp.h ../lib/addoninfo.h ../lib/astutils.h ../lib/color.h ../lib/config.h ../lib/errorlogger.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/path.h ../lib/platform.h ../lib/preprocessor.h ../lib/settings.h ../lib/smallvector.h ../lib/sourcelocation.h ../lib/standards.h ../lib/summaries.h ../lib/suppressions.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/timer.h ../lib/token.h ../lib/tokenize.h ../lib/tokenlist.h ../lib/utils.h ../lib/valueflow.h ../lib/vfvalue.h
@@ -325,6 +326,9 @@ $(libcppdir)/tokenlist.o: ../lib/tokenlist.cpp ../externals/simplecpp/simplecpp.
325326
$(libcppdir)/utils.o: ../lib/utils.cpp ../lib/config.h ../lib/utils.h
326327
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
327328

329+
$(libcppdir)/vf_enumvalue.o: ../lib/vf_enumvalue.cpp ../lib/config.h ../lib/errortypes.h ../lib/library.h ../lib/mathlib.h ../lib/sourcelocation.h ../lib/standards.h ../lib/symboldatabase.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/valueflow.h ../lib/vf_enumvalue.h ../lib/vfvalue.h
330+
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_enumvalue.cpp
331+
328332
$(libcppdir)/vfvalue.o: ../lib/vfvalue.cpp ../lib/config.h ../lib/errortypes.h ../lib/mathlib.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
329333
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
330334

‎tools/dmake/dmake.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ int main(int argc, char **argv)
472472
libfiles_h.emplace_back("tokenrange.h");
473473
libfiles_h.emplace_back("valueptr.h");
474474
libfiles_h.emplace_back("version.h");
475+
libfiles_h.emplace_back("vf_analyze.h");
475476
libfiles_h.emplace_back("xml.h");
476477
std::sort(libfiles_h.begin(), libfiles_h.end());
477478

0 commit comments

Comments
 (0)