[clang][deps] Fix race condition

[jansvoboda11]

Summary

D140176 introduced new FullDeps API that's not thread-safe, breaking the class invariant. This was causing race condition when clang-scan-deps was run with multiple threads.

clang/tools/clang-scan-deps/ClangScanDeps.cpp

static llvm::json::Array toJSONSorted(std::vector<ModuleID> V) {
   return Ret;
 }
 
 // Thread safe.
 class FullDeps {
 public:
   void mergeDeps(StringRef Input, TranslationUnitDeps TUDeps,
                  size_t InputIndex) {
+    mergeDeps(std::move(TUDeps.ModuleGraph), InputIndex);
+
     InputDeps ID;
     ID.FileName = std::string(Input);
     ID.ContextHash = std::move(TUDeps.ID.ContextHash);
     ID.FileDeps = std::move(TUDeps.FileDeps);
     ID.ModuleDeps = std::move(TUDeps.ClangModuleDeps);
-    mergeDeps(std::move(TUDeps.ModuleGraph), InputIndex);
     ID.DriverCommandLine = std::move(TUDeps.DriverCommandLine);
     ID.Commands = std::move(TUDeps.Commands);
+
+    std::unique_lock<std::mutex> ul(Lock);
     Inputs.push_back(std::move(ID));
   }
 
   void mergeDeps(ModuleDepsGraph Graph, size_t InputIndex) {
     std::unique_lock<std::mutex> ul(Lock);
     for (const ModuleDeps &MD : Graph) {
       auto I = Modules.find({MD.ID, 0});
       if (I != Modules.end()) {