Skip to content

Commit 93ea424

Browse files
pfultz2pfultz2
authored
reverted remaining Valueflow changes (danmar#7040)
Move `valueFlowNumber` and `valueFlowEnumValue` back to valueflow.cpp and remove the unused header files.
1 parent c063121 commit 93ea424

24 files changed

+57
-679
lines changed

‎Makefile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ LIBOBJ = $(libcppdir)/valueflow.o \
256256
$(libcppdir)/utils.o \
257257
$(libcppdir)/vf_analyzers.o \
258258
$(libcppdir)/vf_common.o \
259-
$(libcppdir)/vf_enumvalue.o \
260-
$(libcppdir)/vf_number.o \
261259
$(libcppdir)/vf_settokenvalue.o \
262260
$(libcppdir)/vfvalue.o
263261

@@ -459,7 +457,7 @@ validateRules:
459457

460458
###### Build
461459

462-
$(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_analyzers.h lib/vf_common.h lib/vf_enumvalue.h lib/vf_number.h lib/vf_settokenvalue.h lib/vfvalue.h
460+
$(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_analyzers.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
463461
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
464462

465463
$(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
@@ -657,12 +655,6 @@ $(libcppdir)/vf_analyzers.o: lib/vf_analyzers.cpp lib/addoninfo.h lib/analyzer.h
657655
$(libcppdir)/vf_common.o: lib/vf_common.cpp lib/addoninfo.h lib/astutils.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
658656
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_common.cpp
659657

660-
$(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
661-
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_enumvalue.cpp
662-
663-
$(libcppdir)/vf_number.o: lib/vf_number.cpp lib/addoninfo.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vf_common.h lib/vf_number.h lib/vf_settokenvalue.h lib/vfvalue.h
664-
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_number.cpp
665-
666658
$(libcppdir)/vf_settokenvalue.o: lib/vf_settokenvalue.cpp lib/addoninfo.h lib/astutils.h lib/calculate.h lib/config.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/valueflow.h lib/vf_common.h lib/vf_settokenvalue.h lib/vfvalue.h
667659
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vf_settokenvalue.cpp
668660

‎lib/cppcheck.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@
9191
<ClCompile Include="utils.cpp" />
9292
<ClCompile Include="vf_analyzers.cpp" />
9393
<ClCompile Include="vf_common.cpp" />
94-
<ClCompile Include="vf_enumvalue.cpp" />
95-
<ClCompile Include="vf_number.cpp" />
9694
<ClCompile Include="vf_settokenvalue.cpp" />
9795
<ClCompile Include="vfvalue.cpp" />
9896
</ItemGroup>
@@ -179,8 +177,6 @@
179177
<ClInclude Include="vf_analyze.h" />
180178
<ClInclude Include="vf_analyzers.h" />
181179
<ClInclude Include="vf_common.h" />
182-
<ClInclude Include="vf_enumvalue.h" />
183-
<ClInclude Include="vf_number.h" />
184180
<ClInclude Include="vf_settokenvalue.h" />
185181
<ClInclude Include="vfvalue.h" />
186182
<ClInclude Include="xml.h" />

‎lib/valueflow.cpp‎

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

108-
#include "vf_analyze.h"
109108
#include "vf_analyzers.h"
110109
#include "vf_common.h"
111110
#include "vf_settokenvalue.h"
@@ -555,6 +554,31 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, int m
555554
return 0;
556555
}
557556

557+
static void valueFlowNumber(TokenList &tokenlist, const Settings& settings)
558+
{
559+
for (Token *tok = tokenlist.front(); tok;) {
560+
tok = ValueFlow::valueFlowSetConstantValue(tok, settings);
561+
}
562+
563+
if (tokenlist.isCPP() || settings.standards.c >= Standards::C23) {
564+
for (Token *tok = tokenlist.front(); tok; tok = tok->next()) {
565+
if (tok->isName() && !tok->varId() && Token::Match(tok, "false|true")) {
566+
ValueFlow::Value value(tok->str() == "true");
567+
if (!tok->isTemplateArg())
568+
value.setKnown();
569+
setTokenValue(tok, std::move(value), settings);
570+
} else if (Token::Match(tok, "[(,] NULL [,)]")) {
571+
// NULL function parameters are not simplified in the
572+
// normal tokenlist
573+
ValueFlow::Value value(0);
574+
if (!tok->isTemplateArg())
575+
value.setKnown();
576+
setTokenValue(tok->next(), std::move(value), settings);
577+
}
578+
}
579+
}
580+
}
581+
558582
static void valueFlowString(TokenList& tokenlist, const Settings& settings)
559583
{
560584
for (Token* tok = tokenlist.front(); tok; tok = tok->next()) {
@@ -1113,6 +1137,33 @@ static void valueFlowImpossibleValues(TokenList& tokenList, const Settings& sett
11131137
}
11141138
}
11151139

1140+
static void valueFlowEnumValue(SymbolDatabase & symboldatabase, const Settings & settings)
1141+
{
1142+
for (Scope & scope : symboldatabase.scopeList) {
1143+
if (scope.type != Scope::eEnum)
1144+
continue;
1145+
MathLib::bigint value = 0;
1146+
bool prev_enum_is_known = true;
1147+
1148+
for (Enumerator & enumerator : scope.enumeratorList) {
1149+
if (enumerator.start) {
1150+
auto* rhs = const_cast<Token*>(enumerator.start->previous()->astOperand2());
1151+
ValueFlow::valueFlowConstantFoldAST(rhs, settings);
1152+
if (rhs && rhs->hasKnownIntValue()) {
1153+
enumerator.value = rhs->values().front().intvalue;
1154+
enumerator.value_known = true;
1155+
value = enumerator.value + 1;
1156+
prev_enum_is_known = true;
1157+
} else
1158+
prev_enum_is_known = false;
1159+
} else if (prev_enum_is_known) {
1160+
enumerator.value = value++;
1161+
enumerator.value_known = true;
1162+
}
1163+
}
1164+
}
1165+
}
1166+
11161167
static void valueFlowGlobalConstVar(TokenList& tokenList, const Settings& settings)
11171168
{
11181169
// Get variable values...
@@ -7164,13 +7215,13 @@ void ValueFlow::setValues(TokenList& tokenlist,
71647215

71657216
ValueFlowPassRunner runner{ValueFlowState{tokenlist, symboldatabase, errorLogger, settings}, timerResults};
71667217
runner.run_once({
7167-
VFA(analyzeEnumValue(symboldatabase, settings)),
7168-
VFA(analyzeNumber(tokenlist, settings)),
7218+
VFA(valueFlowEnumValue(symboldatabase, settings)),
7219+
VFA(valueFlowNumber(tokenlist, settings)),
71697220
VFA(valueFlowString(tokenlist, settings)),
71707221
VFA(valueFlowArray(tokenlist, settings)),
71717222
VFA(valueFlowUnknownFunctionReturn(tokenlist, settings)),
71727223
VFA(valueFlowGlobalConstVar(tokenlist, settings)),
7173-
VFA(analyzeEnumValue(symboldatabase, settings)),
7224+
VFA(valueFlowEnumValue(symboldatabase, settings)),
71747225
VFA(valueFlowGlobalStaticVar(tokenlist, settings)),
71757226
VFA(valueFlowPointerAlias(tokenlist, settings)),
71767227
VFA(valueFlowLifetime(tokenlist, errorLogger, settings)),

‎lib/vf_analyze.h‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎lib/vf_array.h‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎lib/vf_arraybool.h‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎lib/vf_arrayelement.h‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎lib/vf_bitand.h‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎lib/vf_debug.h‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎lib/vf_enumvalue.cpp‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)