[analyzer][UninitializedObjectChecker] Refactoring p5.: Handle pedantic mode in the checker class only
Differential Revision: https://reviews.llvm.org/D50508
llvm-svn: 339601
diff --git a/clang/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
index c2f4b05..876aebb 100644
--- a/clang/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/UninitializedObject/UninitializedObjectChecker.cpp
@@ -136,7 +136,7 @@
if (!Object)
return;
- FindUninitializedFields F(Context.getState(), Object->getRegion(), IsPedantic,
+ FindUninitializedFields F(Context.getState(), Object->getRegion(),
CheckPointeeInitialization);
const UninitFieldMap &UninitFields = F.getUninitFields();
@@ -144,6 +144,12 @@
if (UninitFields.empty())
return;
+ // In non-pedantic mode, if Object's region doesn't contain a single
+ // initialized field, we'll assume that Object was intentionally left
+ // uninitialized.
+ if (!IsPedantic && !F.isAnyFieldInitialized())
+ return;
+
// There are uninitialized fields in the record.
ExplodedNode *Node = Context.generateNonFatalErrorNode(Context.getState());
@@ -192,18 +198,12 @@
//===----------------------------------------------------------------------===//
FindUninitializedFields::FindUninitializedFields(
- ProgramStateRef State, const TypedValueRegion *const R, bool IsPedantic,
+ ProgramStateRef State, const TypedValueRegion *const R,
bool CheckPointeeInitialization)
- : State(State), ObjectR(R), IsPedantic(IsPedantic),
- CheckPointeeInitialization(CheckPointeeInitialization) {}
+ : State(State), ObjectR(R),
+ CheckPointeeInitialization(CheckPointeeInitialization) {
-const UninitFieldMap &FindUninitializedFields::getUninitFields() {
isNonUnionUninit(ObjectR, FieldChainInfo(ChainFactory));
-
- if (!IsPedantic && !IsAnyFieldInitialized)
- UninitFields.clear();
-
- return UninitFields;
}
bool FindUninitializedFields::addFieldToUninits(FieldChainInfo Chain) {