ymandel created this revision.
ymandel added a reviewer: sgatev.
Herald added subscribers: tschuett, steakhal.
Herald added a project: All.
ymandel requested review of this revision.
Herald added a project: clang.
When pre-initializing fields in the environment, the code assumed that all
fields of a struct would be initialized. However, given limits on value
construction, that assumption is incorrect. This patch changes the code to drop
that assumption and thereby avoid dereferencing a nullptr.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D121158
Files:
clang/include/clang/Analysis/FlowSensitive/Value.h
clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
Index: clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
===================================================================
--- clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
+++ clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
@@ -181,7 +181,7 @@
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<IntegerValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
EXPECT_EQ(Env.getValue(*BarLoc), BarVal);
});
}
@@ -227,7 +227,7 @@
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<IntegerValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
EXPECT_EQ(Env.getValue(*BarLoc), BarVal);
});
}
@@ -351,27 +351,27 @@
cast<StructValue>(Env.getValue(FooVal->getPointeeLoc()));
const auto *BarVal =
- cast<ReferenceValue>(&FooPointeeVal->getChild(*BarDecl));
+ cast<ReferenceValue>(FooPointeeVal->getChild(*BarDecl));
const auto *BarPointeeVal =
cast<StructValue>(Env.getValue(BarVal->getPointeeLoc()));
const auto *FooRefVal =
- cast<ReferenceValue>(&BarPointeeVal->getChild(*FooRefDecl));
+ cast<ReferenceValue>(BarPointeeVal->getChild(*FooRefDecl));
const StorageLocation &FooRefPointeeLoc = FooRefVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(FooRefPointeeLoc), IsNull());
const auto *FooPtrVal =
- cast<PointerValue>(&BarPointeeVal->getChild(*FooPtrDecl));
+ cast<PointerValue>(BarPointeeVal->getChild(*FooPtrDecl));
const StorageLocation &FooPtrPointeeLoc = FooPtrVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(FooPtrPointeeLoc), IsNull());
const auto *BazRefVal =
- cast<ReferenceValue>(&BarPointeeVal->getChild(*BazRefDecl));
+ cast<ReferenceValue>(BarPointeeVal->getChild(*BazRefDecl));
const StorageLocation &BazRefPointeeLoc = BazRefVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(BazRefPointeeLoc), NotNull());
const auto *BazPtrVal =
- cast<PointerValue>(&BarPointeeVal->getChild(*BazPtrDecl));
+ cast<PointerValue>(BarPointeeVal->getChild(*BazPtrDecl));
const StorageLocation &BazPtrPointeeLoc = BazPtrVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(BazPtrPointeeLoc), NotNull());
});
@@ -508,27 +508,27 @@
cast<StructValue>(Env.getValue(FooVal->getPointeeLoc()));
const auto *BarVal =
- cast<PointerValue>(&FooPointeeVal->getChild(*BarDecl));
+ cast<PointerValue>(FooPointeeVal->getChild(*BarDecl));
const auto *BarPointeeVal =
cast<StructValue>(Env.getValue(BarVal->getPointeeLoc()));
const auto *FooRefVal =
- cast<ReferenceValue>(&BarPointeeVal->getChild(*FooRefDecl));
+ cast<ReferenceValue>(BarPointeeVal->getChild(*FooRefDecl));
const StorageLocation &FooRefPointeeLoc = FooRefVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(FooRefPointeeLoc), IsNull());
const auto *FooPtrVal =
- cast<PointerValue>(&BarPointeeVal->getChild(*FooPtrDecl));
+ cast<PointerValue>(BarPointeeVal->getChild(*FooPtrDecl));
const StorageLocation &FooPtrPointeeLoc = FooPtrVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(FooPtrPointeeLoc), IsNull());
const auto *BazRefVal =
- cast<ReferenceValue>(&BarPointeeVal->getChild(*BazRefDecl));
+ cast<ReferenceValue>(BarPointeeVal->getChild(*BazRefDecl));
const StorageLocation &BazRefPointeeLoc = BazRefVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(BazRefPointeeLoc), NotNull());
const auto *BazPtrVal =
- cast<PointerValue>(&BarPointeeVal->getChild(*BazPtrDecl));
+ cast<PointerValue>(BarPointeeVal->getChild(*BazPtrDecl));
const StorageLocation &BazPtrPointeeLoc = BazPtrVal->getPointeeLoc();
EXPECT_THAT(Env.getValue(BazPtrPointeeLoc), NotNull());
});
@@ -888,7 +888,7 @@
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<IntegerValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
EXPECT_EQ(Env.getValue(*BarLoc), BarVal);
});
}
@@ -1000,7 +1000,7 @@
const auto *FooLoc = cast<AggregateStorageLocation>(
Env.getStorageLocation(*FooDecl, SkipPast::None));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<IntegerValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
@@ -1048,7 +1048,7 @@
const auto *FooLoc = cast<AggregateStorageLocation>(
Env.getStorageLocation(*FooDecl, SkipPast::None));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<IntegerValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz");
ASSERT_THAT(BazDecl, NotNull());
@@ -1095,7 +1095,7 @@
const auto *FooLoc = cast<AggregateStorageLocation>(
Env.getStorageLocation(*FooDecl, SkipPast::None));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<ReferenceValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<ReferenceValue>(FooVal->getChild(*BarDecl));
const auto *BarPointeeVal =
cast<IntegerValue>(Env.getValue(BarVal->getPointeeLoc()));
@@ -1173,7 +1173,7 @@
const auto *BazLoc =
cast<ScalarStorageLocation>(&QuxLoc->getChild(*BazDecl));
- const auto *BazVal = cast<IntegerValue>(&QuxVal->getChild(*BazDecl));
+ const auto *BazVal = cast<IntegerValue>(QuxVal->getChild(*BazDecl));
EXPECT_EQ(Env.getValue(*BazLoc), BazVal);
const ValueDecl *QuuxDecl = findValueDecl(ASTCtx, "Quux");
@@ -1249,7 +1249,7 @@
const auto *BazLoc =
cast<ScalarStorageLocation>(&QuxLoc->getChild(*BazDecl));
- const auto *BazVal = cast<IntegerValue>(&QuxVal->getChild(*BazDecl));
+ const auto *BazVal = cast<IntegerValue>(QuxVal->getChild(*BazDecl));
EXPECT_EQ(Env.getValue(*BazLoc), BazVal);
const ValueDecl *QuuxDecl = findValueDecl(ASTCtx, "Quux");
@@ -1399,7 +1399,7 @@
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<IntegerValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
EXPECT_EQ(Env.getValue(*BarLoc), BarVal);
});
}
@@ -1438,7 +1438,7 @@
cast<ScalarStorageLocation>(&FooLoc->getChild(*BarDecl));
const auto *FooVal = cast<StructValue>(Env.getValue(*FooLoc));
- const auto *BarVal = cast<IntegerValue>(&FooVal->getChild(*BarDecl));
+ const auto *BarVal = cast<IntegerValue>(FooVal->getChild(*BarDecl));
EXPECT_EQ(Env.getValue(*BarLoc), BarVal);
},
LangStandard::lang_cxx14);
@@ -1706,7 +1706,7 @@
*cast<StructValue>(Env.getValue(*FooDecl, SkipPast::None));
const auto *BarVal =
cast<IntegerValue>(Env.getValue(*BarDecl, SkipPast::None));
- EXPECT_EQ(BarVal, &FooVal.getChild(*BazDecl));
+ EXPECT_EQ(BarVal, FooVal.getChild(*BazDecl));
});
}
@@ -1982,12 +1982,12 @@
cast<StructValue>(Env.getValue(*QuuxDecl, SkipPast::None));
ASSERT_THAT(QuuxVal, NotNull());
- const auto *BazVal = cast<StructValue>(&QuuxVal->getChild(*BazDecl));
+ const auto *BazVal = cast<StructValue>(QuuxVal->getChild(*BazDecl));
ASSERT_THAT(BazVal, NotNull());
- EXPECT_EQ(&QuuxVal->getChild(*BarDecl), BarArgVal);
- EXPECT_EQ(&BazVal->getChild(*FooDecl), FooArgVal);
- EXPECT_EQ(&QuuxVal->getChild(*QuxDecl), QuxArgVal);
+ EXPECT_EQ(QuuxVal->getChild(*BarDecl), BarArgVal);
+ EXPECT_EQ(BazVal->getChild(*FooDecl), FooArgVal);
+ EXPECT_EQ(QuuxVal->getChild(*QuxDecl), QuxArgVal);
});
}
}
@@ -2383,7 +2383,7 @@
const auto *A2Val =
cast<StructValue>(Env.getValue(*A2Decl, SkipPast::None));
- EXPECT_EQ(&A2Val->getChild(*FooDecl), BarVal);
+ EXPECT_EQ(A2Val->getChild(*FooDecl), BarVal);
});
}
Index: clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
===================================================================
--- clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
+++ clang/lib/Analysis/FlowSensitive/DataflowEnvironment.cpp
@@ -366,7 +366,8 @@
assert(Field != nullptr);
StorageLocation &FieldLoc = AggregateLoc.getChild(*Field);
MemberLocToStruct[&FieldLoc] = std::make_pair(StructVal, Field);
- setValue(FieldLoc, StructVal->getChild(*Field));
+ if (auto *FieldVal = StructVal->getChild(*Field))
+ setValue(FieldLoc, *FieldVal);
}
}
@@ -485,9 +486,9 @@
continue;
Visited.insert(FieldType.getCanonicalType());
- FieldValues.insert(
- {Field, createValueUnlessSelfReferential(
- FieldType, Visited, Depth + 1, CreatedValuesCount)});
+ if (auto *FieldValue = createValueUnlessSelfReferential(
+ FieldType, Visited, Depth + 1, CreatedValuesCount))
+ FieldValues.insert({Field, FieldValue});
Visited.erase(FieldType.getCanonicalType());
}
Index: clang/include/clang/Analysis/FlowSensitive/Value.h
===================================================================
--- clang/include/clang/Analysis/FlowSensitive/Value.h
+++ clang/include/clang/Analysis/FlowSensitive/Value.h
@@ -201,11 +201,13 @@
return Val->getKind() == Kind::Struct;
}
- /// Returns the child value that is assigned for `D`.
- Value &getChild(const ValueDecl &D) const {
+ /// Returns the child value that is assigned for `D` or null if the child is
+ /// not initialized.
+ Value *getChild(const ValueDecl &D) const {
auto It = Children.find(&D);
- assert(It != Children.end());
- return *It->second;
+ if (It == Children.end())
+ return nullptr;
+ return It->second;
}
/// Assigns `Val` as the child value for `D`.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
