mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 14:16:08 +00:00
Code Issues Projects Releases Wiki Activity

[clang][dataflow] Fix initializing a reference field with an InitListExpr.

Browse Source 
I added a test for this as the ongoing migration to strict handling of value categories (see https://discourse.llvm.org/t/70086) will change the code that handles this case. It turns out we already didn't handle this correctly, so I fixed the existing implementation.

Depends On D154961

Reviewed By: xazax.hun

Differential Revision: https://reviews.llvm.org/D154965
This commit is contained in:
Martin Braenne 2023-07-12 04:42:48 +00:00
parent b47bdcbc72
commit bd9b57de4f
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/Analysis/FlowSensitive/Transfer.cpp
View File

@ -717,14 +717,15 @@ public:
if (Type->isStructureOrClassType()) {
std::vector<FieldDecl *> Fields =
getFieldsForInitListExpr(Type->getAsRecordDecl());
for (auto It : llvm::zip(Fields, S->inits())) {
const FieldDecl *Field = std::get<0>(It);
for (auto [Field, Init] : llvm::zip(Fields, S->inits())) {
assert(Field != nullptr);
const Expr *Init = std::get<1>(It);
assert(Init != nullptr);
if (Value *InitVal = Env.getValue(*Init, SkipPast::None))
if (Field->getType()->isReferenceType()) {
if (StorageLocation *Loc = Env.getStorageLocationStrict(*Init))
cast<StructValue>(Val)->setChild(*Field,
Env.create<ReferenceValue>(*Loc));
} else if (Value *InitVal = Env.getValue(*Init, SkipPast::None))
cast<StructValue>(Val)->setChild(*Field, *InitVal);
}
}

28
clang/unittests/Analysis/FlowSensitive/TransferTest.cpp
View File

@ -2912,6 +2912,34 @@ TEST(TransferTest, AggregateInitialization) {
}
}
TEST(TransferTest, AggregateInitializationReferenceField) {
std::string Code = R"(
struct S {
int &RefField;
};
void target(int i) {
S s = { i };
/*[[p]]*/
}
)";
runDataflow(
Code,
[](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results,
ASTContext &ASTCtx) {
const Environment &Env = getEnvironmentAtAnnotation(Results, "p");
const ValueDecl *RefFieldDecl = findValueDecl(ASTCtx, "RefField");
auto &ILoc = getLocForDecl<StorageLocation>(ASTCtx, Env, "i");
auto &SLoc = getLocForDecl<AggregateStorageLocation>(ASTCtx, Env, "s");
auto &RefValue =
*cast<ReferenceValue>(getFieldValue(&SLoc, *RefFieldDecl, Env));
EXPECT_EQ(&RefValue.getReferentLoc(), &ILoc);
});
}
TEST(TransferTest, AssignToUnionMember) {
std::string Code = R"(
union A {