diff --git a/clang/lib/Analysis/FlowSensitive/Transfer.cpp b/clang/lib/Analysis/FlowSensitive/Transfer.cpp --- a/clang/lib/Analysis/FlowSensitive/Transfer.cpp +++ b/clang/lib/Analysis/FlowSensitive/Transfer.cpp @@ -95,6 +95,11 @@ : Env.makeNot(LHSEqRHSValue)); break; } + case BO_Comma: { + if (auto *Loc = Env.getStorageLocation(*RHS, SkipPast::None)) + Env.setStorageLocation(*S, *Loc); + break; + } default: break; } diff --git a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp --- a/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp +++ b/clang/unittests/Analysis/FlowSensitive/TransferTest.cpp @@ -3557,4 +3557,35 @@ }); } +TEST_F(TransferTest, BinaryOperatorComma) { + std::string Code = R"( + void target(int Foo, int Bar) { + int &Baz = (Foo, Bar); + // [[p]] + } + )"; + runDataflow(Code, + [](llvm::ArrayRef< + std::pair>> + Results, + ASTContext &ASTCtx) { + ASSERT_THAT(Results, ElementsAre(Pair("p", _))); + const Environment &Env = Results[0].second.Env; + + const ValueDecl *BarDecl = findValueDecl(ASTCtx, "Bar"); + ASSERT_THAT(BarDecl, NotNull()); + + const ValueDecl *BazDecl = findValueDecl(ASTCtx, "Baz"); + ASSERT_THAT(BazDecl, NotNull()); + + const StorageLocation *BarLoc = + Env.getStorageLocation(*BarDecl, SkipPast::Reference); + ASSERT_THAT(BarLoc, NotNull()); + + const StorageLocation *BazLoc = + Env.getStorageLocation(*BazDecl, SkipPast::Reference); + EXPECT_EQ(BazLoc, BarLoc); + }); +} + } // namespace