dsymutil auto infer cas-path

Author: cachemeifyoucan

clang/test/ClangScanDeps/gmodules.c

@@ -4,6 +4,7 @@
 // RUN: split-file %s %t
 // RUN: sed "s|DIR|%/t|g" %t/cdb.json.template > %t/cdb.json
 // RUN: sed "s|DIR|%/t|g" %t/cdb_pch.json.template > %t/cdb_pch.json
+// RUN: sed "s|DIR|%/t|g" %t/cas-config.template > %t/.cas-config
 
 /// Scan PCH
 // RUN: clang-scan-deps -compilation-database %t/cdb_pch.json \
@@ -36,6 +37,7 @@
 /// Check debug info is correct.
 // RUN: %clang %t/tu.o -o %t/a.out
 // RUN: dsymutil -cas %t/cas %t/a.out -o %t/a.dSYM 2>&1 | FileCheck %s --check-prefix=WARN --allow-empty
+// RUN: dsymutil %t/a.out -o %t/a2.dSYM 2>&1 | FileCheck %s --check-prefix=WARN --allow-empty
 // WARN-NOT: warning:
 
 // RUN: llvm-dwarfdump --debug-info %t/a.dSYM | FileCheck %s --check-prefix=DWARF
@@ -58,7 +60,11 @@
 // RUN: %deps-to-rsp %t/deps_2.json --module-name Right > %t/Right_2.rsp
 // RUN: %deps-to-rsp %t/deps_2.json --tu-index 0 > %t/tu_2.rsp
 // RUN: %clang @%t/Right_2.rsp
-// RUN: %clang @%t/tu_2.rsp
+// RUN: %clang @%t/tu_2.rsp -o %t/tu_2.o
+
+/// Diff all outputs
+// RUN: diff %t/prefix.h.pch %t/prefix_2.pch
+// RUN: diff %t/tu.o %t/tu_2.o
 
 // Check all the types are available
 // DWARF: DW_TAG_compile_unit
@@ -213,3 +219,8 @@ int main(void) {
   struct Top _top;
   struct Prefix _prefix;
 }
+
+//--- cas-config.template
+{
+  "CASPath": "DIR/cas"
+}

llvm/tools/dsymutil/BinaryHolder.cpp

@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "BinaryHolder.h"
+#include "llvm/CAS/CASConfiguration.h"
 #include "llvm/Object/MachO.h"
 #include "llvm/Support/WithColor.h"
 #include "llvm/Support/raw_ostream.h"
@@ -263,6 +264,22 @@ BinaryHolder::ArchiveEntry::getObjectEntry(StringRef Filename,
   return *(MemberCache[Key] = std::move(OE));
 }
 
+static std::shared_ptr<cas::ObjectStore> searchAndCreateCAS(StringRef Path) {
+  auto Config = cas::CASConfiguration::createFromSearchConfigFile(Path);
+  if (!Config)
+    return nullptr;
+
+  auto DB = Config->second.createDatabases();
+  if (!DB) {
+    consumeError(DB.takeError());
+    return nullptr;
+  }
+
+  WithColor::note() << "create CAS using configuration: " << Config->first
+                    << "'\n";
+  return DB->first;
+}
+
 Expected<const BinaryHolder::ObjectEntry &>
 BinaryHolder::getObjectEntry(StringRef Filename, TimestampTy Timestamp) {
   if (Opts.Verbose)
@@ -297,6 +314,9 @@ BinaryHolder::getObjectEntry(StringRef Filename, TimestampTy Timestamp) {
   ObjectRefCounter[Filename]++;
   if (!ObjectCache.count(Filename)) {
     auto OE = std::make_unique<ObjectEntry>();
+    if (!CAS)
+      CAS = searchAndCreateCAS(Filename);
+
     if (!(CAS && OE->load(*CAS, Filename, Opts))) {
       auto Err = OE->load(VFS, Filename, Timestamp, Opts);
       if (Err)