Merge pull request swiftlang#15689 from dcci/moduleimport-rightinfo

Author: swift-ci

test/DebugInfo/DumpDeclFromMangledName.swift

@@ -7,7 +7,7 @@
 // RUN: sed -ne '/--->/s/^.*---> *//p' < %S/Inputs/decl-reconstr-names.txt > %t.check
 
 // RUN: %target-build-swift -emit-executable %s -g -o %t/DeclReconstr -emit-module
-// RUN: %lldb-moduleimport-test %t/DeclReconstr -target-triple %target-triple \
+// RUN: %lldb-moduleimport-test %t/DeclReconstr \
 // RUN:   -decl-from-mangled=%t.input > %t.output 2>&1
 // RUN: diff %t.check %t.output
 

tools/lldb-moduleimport-test/lldb-moduleimport-test.cpp

@@ -42,10 +42,10 @@ void anchorForGetMainExecutable() {}
 
 using namespace llvm::MachO;
 
-static bool validateModule(llvm::StringRef data, bool Verbose) {
-  swift::serialization::ExtendedValidationInfo extendedInfo;
-  swift::serialization::ValidationInfo info =
-      swift::serialization::validateSerializedAST(data, &extendedInfo);
+static bool validateModule(llvm::StringRef data, bool Verbose,
+                           swift::serialization::ValidationInfo &info,
+                           swift::serialization::ExtendedValidationInfo &extendedInfo) {
+  info = swift::serialization::validateSerializedAST(data, &extendedInfo);
   if (info.status != swift::serialization::Status::Valid)
     return false;
 
@@ -175,9 +175,6 @@ int main(int argc, char **argv) {
     llvm::cl::Positional, llvm::cl::desc("compiled_swift_file1.o ..."),
     llvm::cl::OneOrMore);
 
-  llvm::cl::opt<std::string> SDK(
-    "sdk", llvm::cl::desc("path to the SDK to build against"));
-
   llvm::cl::opt<bool> DumpModule(
     "dump-module", llvm::cl::desc(
       "Dump the imported module after checking it imports just fine"));
@@ -188,54 +185,39 @@ int main(int argc, char **argv) {
   llvm::cl::opt<std::string> ModuleCachePath(
     "module-cache-path", llvm::cl::desc("Clang module cache path"));
 
-  llvm::cl::list<std::string> ImportPaths(
-    "I", llvm::cl::desc("add a directory to the import search path"));
-
-  llvm::cl::list<std::string> FrameworkPaths(
-    "F", llvm::cl::desc("add a directory to the framework search path"));
-
   llvm::cl::opt<std::string> DumpDeclFromMangled(
       "decl-from-mangled", llvm::cl::desc("dump decl from mangled names list"));
 
   llvm::cl::opt<std::string> DumpTypeFromMangled(
       "type-from-mangled", llvm::cl::desc("dump type from mangled names list"));
 
-  // FIXME: we should infer this from the module.
-  llvm::cl::opt<std::string> TargetTriple(
-      "target-triple", llvm::cl::desc("specify target triple"));
-
   llvm::cl::ParseCommandLineOptions(argc, argv);
   // Unregister our options so they don't interfere with the command line
   // parsing in CodeGen/BackendUtil.cpp.
-  FrameworkPaths.removeArgument();
-  ImportPaths.removeArgument();
   ModuleCachePath.removeArgument();
   DumpModule.removeArgument();
   DumpTypeFromMangled.removeArgument();
-  SDK.removeArgument();
   InputNames.removeArgument();
-  TargetTriple.removeArgument();
 
   // Fetch the serialized module bitstreams from the Mach-O files and
   // register them with the module loader.
   llvm::SmallVector<std::pair<char *, uint64_t>, 8> Modules;
   if (!collectASTModules(InputNames, Modules))
     return 1;
 
+  if (Modules.empty())
+    return 0;
+
+  swift::serialization::ValidationInfo info;
+  swift::serialization::ExtendedValidationInfo extendedInfo;
   for (auto &Module : Modules) {
-    if (!validateModule(StringRef(Module.first, Module.second), Verbose)) {
+    if (!validateModule(StringRef(Module.first, Module.second), Verbose, info,
+                        extendedInfo)) {
       llvm::errs() << "Malformed module!\n";
       return 1;
     }
   }
 
-  // If no SDK was specified via -sdk, check environment variable SDKROOT.
-  if (SDK.getNumOccurrences() == 0) {
-    const char *SDKROOT = getenv("SDKROOT");
-    if (SDKROOT)
-      SDK = SDKROOT;
-  }
-
   // Create a Swift compiler.
   llvm::SmallVector<std::string, 4> modules;
   swift::CompilerInstance CI;
@@ -245,22 +227,12 @@ int main(int argc, char **argv) {
       llvm::sys::fs::getMainExecutable(argv[0],
           reinterpret_cast<void *>(&anchorForGetMainExecutable)));
 
-  Invocation.setSDKPath(SDK);
-
-  // FIXME: we should infer this from the module.
-  if (!TargetTriple.empty())
-    Invocation.setTargetTriple(TargetTriple);
-  else
-    Invocation.setTargetTriple(llvm::sys::getDefaultTargetTriple());
+  // Infer SDK and Target triple from the module.
+  Invocation.setSDKPath(extendedInfo.getSDKPath());
+  Invocation.setTargetTriple(info.targetTriple);
 
   Invocation.setModuleName("lldbtest");
   Invocation.getClangImporterOptions().ModuleCachePath = ModuleCachePath;
-  Invocation.setImportSearchPaths(ImportPaths);
-  std::vector<swift::SearchPathOptions::FrameworkSearchPath> FramePaths;
-  for (const auto &path : FrameworkPaths) {
-    FramePaths.push_back({path, /*isSystem=*/false});
-  }
-  Invocation.setFrameworkSearchPaths(FramePaths);
 
   if (CI.setup(Invocation))
     return 1;