Add _const to Swift declaration names of const types

Author: susmonteiro

lib/ClangImporter/ClangClassTemplateNamePrinter.cpp

@@ -63,6 +63,16 @@ struct TemplateInstantiationNamePrinter
     return "_";
   }
 
+  std::string VisitElaboratedType(const clang::ElaboratedType *type) {
+    clang::QualType qType = type->getNamedType();
+    llvm::errs() << "\n=== VisitElaboratedType ===\n\n";
+    if (qType.isConstQualified()) {
+      // TODO need to visit something?
+      return "_const";
+    }
+    return "";
+  }
+
   std::string VisitRecordType(const clang::RecordType *type) {
     auto tagDecl = type->getAsTagDecl();
     if (auto namedArg = dyn_cast_or_null<clang::NamedDecl>(tagDecl)) {
@@ -148,8 +158,12 @@ std::string swift::importer::printClassTemplateSpecializationName(
         // Use import name here so builtin types such as "int" map to their
         // Swift equivalent ("CInt").
         if (arg.getKind() == clang::TemplateArgument::Type) {
-          auto ty = arg.getAsType().getTypePtr();
-          buffer << templateNamePrinter.Visit(ty);
+          auto ty = arg.getAsType();
+          buffer << templateNamePrinter.Visit(ty.getTypePtr());
+          // TODO
+          if (ty.isConstQualified()) {
+            buffer << "_const";
+          }
           return;
         } else if (arg.getKind() == clang::TemplateArgument::Integral) {
           buffer << "_";

lib/ClangImporter/ClangDerivedConformances.cpp

@@ -1156,6 +1156,8 @@ void swift::conformToCxxSpanIfNeeded(ClangImporter::Implementation &impl,
   if (!isStdDecl(clangDecl, {"span"}))
     return;
 
+  llvm::errs() << decl->getName() << '\n';
+
   auto elementType = lookupDirectSingleWithoutExtensions<TypeAliasDecl>(
       decl, ctx.getIdentifier("element_type"));
   auto sizeType = lookupDirectSingleWithoutExtensions<TypeAliasDecl>(

test/Interop/Cxx/stdlib/Inputs/std-span.h

@@ -7,6 +7,7 @@
 
 using Span = std::span<const int>;
 using SpanOfString = std::span<const std::string>;
+using ComplexSpan = std::span<std::span<const int>>;
 
 static int iarray[]{1, 2, 3};
 static std::string sarray[]{"", "ab", "abc"};

test/Interop/Cxx/templates/Inputs/class-template-with-primitive-argument.h

@@ -7,9 +7,23 @@ struct MagicWrapper {
   int getValuePlusArg(int arg) const { return t + arg; }
 };
 
+template<class M>
+struct DoubleWrapper {
+  M m;
+  int getValuePlusArg(int arg) const { return m.getValuePlusArg(arg); }
+};
+
 typedef MagicWrapper<int> WrappedMagicInt;
+typedef MagicWrapper<const int> WrappedMagicIntConst;
+typedef MagicWrapper<const long> WrappedMagicLongConst;
 typedef MagicWrapper<int*> WrappedMagicIntPtr;
 typedef MagicWrapper<const int*> WrappedMagicIntConstPtr;
 typedef MagicWrapper<int**> WrappedMagicIntPtrPtr;
 
+typedef DoubleWrapper<MagicWrapper<int>> DoubleWrappedInt;
+typedef DoubleWrapper<MagicWrapper<const int>> DoubleWrappedIntConst;
+typedef DoubleWrapper<MagicWrapper<const long>> DoubleWrappedLongConst;
+typedef DoubleWrapper<MagicWrapper<int*>> DoubleWrappedIntPtr;
+typedef DoubleWrapper<MagicWrapper<const int*>> DoubleWrappedIntConstPtr;
+
 #endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_PRIMITIVE_ARGUMENT_H

test/Interop/Cxx/templates/class-template-with-primitive-argument-module-interface.swift

@@ -4,7 +4,18 @@
 // CHECK: struct MagicWrapper<T> {
 // CHECK: }
 
+// CHECK: struct DoubleWrapper<M> {
+// CHECK: }
+
 // CHECK: typealias WrappedMagicInt = MagicWrapper<CInt>
+// CHECK: typealias WrappedMagicIntConst = MagicWrapper<CInt_const>
+// CHECK: typealias WrappedMagicLongConst = MagicWrapper<CLong_const>
 // CHECK: typealias WrappedMagicIntPtr = MagicWrapper<UnsafeMutablePointer<CInt>>
 // CHECK: typealias WrappedMagicIntConstPtr = MagicWrapper<UnsafePointer<CInt>>
 // CHECK: typealias WrappedMagicIntPtrPtr = MagicWrapper<UnsafeMutablePointer<UnsafeMutablePointer<CInt>>>
+
+// CHECK: typealias DoubleWrappedInt = DoubleWrapper<MagicWrapper<CInt>>
+// CHECK: typealias DoubleWrappedIntConst = DoubleWrapper<MagicWrapper<CInt_const>>
+// CHECK: typealias DoubleWrappedLongConst = DoubleWrapper<MagicWrapper<CLong_const>>
+// CHECK: typealias DoubleWrappedIntPtr = DoubleWrapper<MagicWrapper<UnsafeMutablePointer<CInt>>>
+// CHECK: typealias DoubleWrappedIntConstPtr = DoubleWrapper<MagicWrapper<UnsafePointer<CInt>>>