lldb-moduleimport-test: Add support for testing Demangle::getTypeForMangling()

The -type-from-mangled flag now uses the new API. The -type-from-mangled-old flag
uses the old API, ide::getTypeFromMangledSymbolname().

For now, just change all existing tests to use the -type-from-mangled-old flag;
I'll be adding new tests for the new API shortly.

Author: slavapestov

test/DebugInfo/DumpDeclFromMangledName.swift

@@ -19,7 +19,7 @@
 // INVALID-DECL: patatino does not exist, exiting.
 
 // RUN: not %lldb-moduleimport-test %t/DeclReconstr \
-// RUN:   --type-from-mangled=patatino 2>&1 | \
+// RUN:   --type-from-mangled-old=patatino 2>&1 | \
 // RUN:   %FileCheck %s --check-prefix=INVALID-TYPE
 // INVALID-TYPE: patatino does not exist, exiting.
 

test/DebugInfo/DumpTypeFromMangledName.swift

@@ -8,7 +8,7 @@
 
 // RUN: %target-build-swift -emit-executable %s -g -o %t/TypeReconstr -emit-module
 // RUN: %lldb-moduleimport-test %t/TypeReconstr \
-// RUN:   -type-from-mangled=%t.input > %t.output 2>&1
+// RUN:   -type-from-mangled-old=%t.input > %t.output 2>&1
 // RUN: diff %t.check %t.output
 
 // REQUIRES: executable_test

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

@@ -16,6 +16,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/AST/ASTDemangler.h"
 #include "swift/ASTSectionImporter/ASTSectionImporter.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/IDE/Utils.h"
@@ -92,6 +93,20 @@ static void resolveDeclFromMangledNameList(
 
 static void resolveTypeFromMangledNameList(
     swift::ASTContext &Ctx, llvm::ArrayRef<std::string> MangledNames) {
+  for (auto &Mangled : MangledNames) {
+    swift::Type ResolvedType =
+        swift::Demangle::getTypeForMangling(Ctx, Mangled);
+    if (!ResolvedType) {
+      llvm::outs() << "Can't resolve type of " << Mangled << "\n";
+    } else {
+      ResolvedType->print(llvm::outs());
+      llvm::outs() << "\n";
+    }
+  }
+}
+
+static void resolveTypeFromMangledNameListOld(
+    swift::ASTContext &Ctx, llvm::ArrayRef<std::string> MangledNames) {
   std::string Error;
   for (auto &Mangled : MangledNames) {
     swift::Type ResolvedType =
@@ -207,6 +222,11 @@ int main(int argc, char **argv) {
       "type-from-mangled", desc("dump type from mangled names list"),
       cat(Visible));
 
+  opt<std::string> DumpTypeFromMangledOld(
+      "type-from-mangled-old", desc("dump type from mangled names list using old "
+                                    "TypeReconstruction API"),
+      cat(Visible));
+
   opt<std::string> ResourceDir(
       "resource-dir",
       desc("The directory that holds the compiler resource files"),
@@ -223,6 +243,7 @@ int main(int argc, char **argv) {
   ModuleCachePath.removeArgument();
   DumpModule.removeArgument();
   DumpTypeFromMangled.removeArgument();
+  DumpTypeFromMangledOld.removeArgument();
   InputNames.removeArgument();
 
   auto validateInputFile = [](std::string Filename) {
@@ -241,6 +262,8 @@ int main(int argc, char **argv) {
 
   if (!validateInputFile(DumpTypeFromMangled))
     return 1;
+  if (!validateInputFile(DumpTypeFromMangledOld))
+    return 1;
   if (!validateInputFile(DumpDeclFromMangled))
     return 1;
 
@@ -330,6 +353,11 @@ int main(int argc, char **argv) {
       collectMangledNames(DumpTypeFromMangled, MangledNames);
       resolveTypeFromMangledNameList(CI.getASTContext(), MangledNames);
     }
+    if (!DumpTypeFromMangledOld.empty()) {
+      llvm::SmallVector<std::string, 8> MangledNames;
+      collectMangledNames(DumpTypeFromMangledOld, MangledNames);
+      resolveTypeFromMangledNameListOld(CI.getASTContext(), MangledNames);
+    }
     if (!DumpDeclFromMangled.empty()) {
       llvm::SmallVector<std::string, 8> MangledNames;
       collectMangledNames(DumpDeclFromMangled, MangledNames);

validation-test/Serialization/bridging-header-first.swift

@@ -2,11 +2,11 @@
 
 // RUN: %target-build-swift -emit-module -emit-executable %s -g -I %S/Inputs/bridging-header-first/ -import-objc-header %S/Inputs/bridging-header-first/bridging.h -o %t/main
 // RUN: llvm-bcanalyzer -dump %t/main.swiftmodule | %FileCheck -check-prefix CHECK-DUMP %s
-// RUN: %lldb-moduleimport-test %t/main -type-from-mangled %S/Inputs/bridging-header-first/mangled.txt 2>&1 | %FileCheck -check-prefix CHECK-RESOLVED-TYPE %s
+// RUN: %lldb-moduleimport-test %t/main -type-from-mangled-old %S/Inputs/bridging-header-first/mangled.txt 2>&1 | %FileCheck -check-prefix CHECK-RESOLVED-TYPE %s
 
 // RUN: %target-build-swift -emit-module -emit-executable %s -g -I %S/Inputs/bridging-header-first/ -import-objc-header %S/Inputs/bridging-header-first/bridging.h -o %t/main -whole-module-optimization
 // RUN: llvm-bcanalyzer -dump %t/main.swiftmodule | %FileCheck -check-prefix CHECK-DUMP %s
-// RUN: %lldb-moduleimport-test %t/main -type-from-mangled %S/Inputs/bridging-header-first/mangled.txt 2>&1 | %FileCheck -check-prefix CHECK-RESOLVED-TYPE %s
+// RUN: %lldb-moduleimport-test %t/main -type-from-mangled-old %S/Inputs/bridging-header-first/mangled.txt 2>&1 | %FileCheck -check-prefix CHECK-RESOLVED-TYPE %s
 
 // REQUIRES: objc_interop