Cherry-pick "Fix build failure and a test."

(cherry picked from commit 23f75b6)

Author: qiongsiwu

clang/test/ClangScanDeps/optimize-vfs-pch-tree.m

@@ -53,7 +53,8 @@
 // CHECK-NEXT:       "clang-module-deps": [
 // CHECK-NEXT:         {
 // CHECK-NEXT:           "context-hash": "{{.*}}",
-// CHECK-NEXT:           "module-name": "E"
+// CHECK-NEXT:           "module-name": "E",
+// CHECK-NEXT:           "exported": "true"
 // CHECK-NEXT:         }
 // CHECK-NEXT:       ],
 // CHECK-NEXT:       "clang-modulemap-file": "[[PREFIX]]/modules/D/module.modulemap",

clang/tools/libclang/CDependencies.cpp

@@ -436,8 +436,8 @@ clang_experimental_DepGraphModule_getModuleDeps(CXDepGraphModule CXDepMod) {
   const ModuleDeps &ModDeps = *unwrap(CXDepMod)->ModDeps;
   std::vector<std::string> Modules;
   Modules.reserve(ModDeps.ClangModuleDeps.size());
-  for (const ModuleID &MID : ModDeps.ClangModuleDeps)
-    Modules.push_back(MID.ModuleName + ":" + MID.ContextHash);
+  for (const auto &Info : ModDeps.ClangModuleDeps)
+    Modules.push_back(Info.ID.ModuleName + ":" + Info.ID.ContextHash);
   return unwrap(CXDepMod)->StrMgr.createCStringsOwned(std::move(Modules));
 }