This is an archive of the discontinued LLVM Phabricator instance.

[ClangScanDeps] Fix data race in `clang-scan-deps` tool
AbandonedPublic

Authored by akyrtzi on Feb 6 2023, 10:03 PM.

Reviewers

jansvoboda11
benlangmuir

Summary

Found using TSan.

akyrtzi requested review of this revision.Feb 6 2023, 10:03 PM

In D143461#4110405, @benlangmuir wrote:

Dupe of https://reviews.llvm.org/D143428 ?

Indeed.

Path

Size

clang/

tools/

clang-scan-deps/

2 lines

Show First 20 Lines • Show All 254 Lines • ▼ Show 20 Lines	void mergeDeps(StringRef Input, TranslationUnitDeps TUDeps,
InputDeps ID;		InputDeps ID;
ID.FileName = std::string(Input);		ID.FileName = std::string(Input);
ID.ContextHash = std::move(TUDeps.ID.ContextHash);		ID.ContextHash = std::move(TUDeps.ID.ContextHash);
ID.FileDeps = std::move(TUDeps.FileDeps);		ID.FileDeps = std::move(TUDeps.FileDeps);
ID.ModuleDeps = std::move(TUDeps.ClangModuleDeps);		ID.ModuleDeps = std::move(TUDeps.ClangModuleDeps);
mergeDeps(std::move(TUDeps.ModuleGraph), InputIndex);		mergeDeps(std::move(TUDeps.ModuleGraph), InputIndex);
ID.DriverCommandLine = std::move(TUDeps.DriverCommandLine);		ID.DriverCommandLine = std::move(TUDeps.DriverCommandLine);
ID.Commands = std::move(TUDeps.Commands);		ID.Commands = std::move(TUDeps.Commands);

		std::unique_lock<std::mutex> ul(Lock);
Inputs.push_back(std::move(ID));		Inputs.push_back(std::move(ID));
}		}

void mergeDeps(ModuleDepsGraph Graph, size_t InputIndex) {		void mergeDeps(ModuleDepsGraph Graph, size_t InputIndex) {
std::unique_lock<std::mutex> ul(Lock);		std::unique_lock<std::mutex> ul(Lock);
for (const ModuleDeps &MD : Graph) {		for (const ModuleDeps &MD : Graph) {
auto I = Modules.find({MD.ID, 0});		auto I = Modules.find({MD.ID, 0});
if (I != Modules.end()) {		if (I != Modules.end()) {
▲ Show 20 Lines • Show All 349 Lines • Show Last 20 Lines