llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Yitzhak Mandelbaum (ymand) <details> <summary>Changes</summary> The commit was itself a crash fix, but inadvertently changed the behavior for unions, which results in crashes. --- Full diff: https://github.com/llvm/llvm-project/pull/81918.diff 2 Files Affected: - (modified) clang/lib/Analysis/FlowSensitive/Transfer.cpp (+6) - (modified) clang/unittests/Analysis/FlowSensitive/TransferTest.cpp (+21) ``````````diff diff --git a/clang/lib/Analysis/FlowSensitive/Transfer.cpp b/clang/lib/Analysis/FlowSensitive/Transfer.cpp index fc7395457f551d..513f22d8aa0f9c 100644 --- a/clang/lib/Analysis/FlowSensitive/Transfer.cpp +++ b/clang/lib/Analysis/FlowSensitive/Transfer.cpp @@ -663,6 +663,12 @@ class TransferVisitor : public ConstStmtVisitor<TransferVisitor> { void VisitInitListExpr(const InitListExpr *S) { QualType Type = S->getType(); + if (Type->isUnionType()) { + if (auto *Val = Env.createValue(Type)) + Env.setValue(*S, *Val); + return; + } + if (!Type->isStructureOrClassType()) { // Until array initialization is implemented, we don't need to care about // cases where `getNumInits() > 1`. diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp index 87e6e83d2e03a9..a65b0446ac7818 100644 --- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -2367,6 +2367,27 @@ TEST(TransferTest, InitListExprAsXValue) { }); } +TEST(TransferTest, InitListExprAsUnion) { + // This is a crash repro. + std::string Code = R"cc( + class target { + union { + int *a; + bool *b; + } F; + + public: + constexpr target() : F{nullptr} {} + }; + )cc"; + runDataflow( + Code, + [](const llvm::StringMap<DataflowAnalysisState<NoopLattice>> &Results, + ASTContext &ASTCtx) { + // Just verify that it doesn't crash. + }); +} + TEST(TransferTest, CopyConstructor) { std::string Code = R"( struct A { `````````` </details> https://github.com/llvm/llvm-project/pull/81918 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
