Merge pull request #40276 from bro4all/eng-PR_SR-14031_pointer_type_fix

Eng pr sr 14031 pointer type fix

Author: zoecarver

lib/ClangImporter/ImportType.cpp

@@ -1907,11 +1907,9 @@ ParameterList *ClangImporter::Implementation::importFunctionParameterList(
     Type swiftParamTy;
     bool isParamTypeImplicitlyUnwrapped = false;
     bool isInOut = false;
-
-    auto referenceType = dyn_cast<clang::ReferenceType>(paramTy);
-    if (referenceType &&
-        isa<clang::TemplateTypeParmType>(referenceType->getPointeeType())) {
-      auto pointeeType = referenceType->getPointeeType();
+    if ((isa<clang::ReferenceType>(paramTy) || isa<clang::PointerType>(paramTy)) &&
+        isa<clang::TemplateTypeParmType>(paramTy->getPointeeType())) {
+      auto pointeeType = paramTy->getPointeeType();
       auto templateParamType = cast<clang::TemplateTypeParmType>(pointeeType);
       PointerTypeKind pointerKind = pointeeType.getQualifiers().hasConst()
                                         ? PTK_UnsafePointer

test/Interop/Cxx/templates/Inputs/function-templates.h

@@ -61,6 +61,8 @@ template <class T> void constLvalueReference(const T &) {}
 
 template <class T> void forwardingReference(T &&) {}
 
+template <class T> void PointerTemplateParameter(T*){}
+
 namespace Orbiters {
 
 template<class T>

test/Interop/Cxx/templates/defaulted-template-type-parameter-module-interface.swift

@@ -17,6 +17,6 @@
 // CHECK: func defaultedTemplateReferenceTypeParam<T>(_ t: UnsafeMutablePointer<T>)
 // The following types aren't imported correctly, but that does not have to do
 // with the fact that the template type paramaters are defaulted.
-// CHECK: func defaultedTemplatePointerTypeParam<T>(_ t: OpaquePointer!)
+// CHECK: func defaultedTemplatePointerTypeParam<T>(_ t: UnsafeMutablePointer<T>)
 // CHECK: func defaultedTemplatePointerReferenceTypeParam<T>(_ t: inout OpaquePointer!)
 // CHECK: func defaultedTemplatePointerPointerTypeParam<T>(_ t: UnsafeMutablePointer<OpaquePointer?>!)

test/Interop/Cxx/templates/function-template-module-interface.swift

@@ -17,6 +17,7 @@
 // CHECK: func lvalueReference<T>(_ ref: UnsafeMutablePointer<T>)
 // CHECK: func constLvalueReference<T>(_: UnsafePointer<T>)
 // CHECK: func forwardingReference<T>(_: UnsafeMutablePointer<T>)
+// CHECK: func PointerTemplateParameter<T>(_: UnsafeMutablePointer<T>)
 
 // CHECK: enum Orbiters {
 // CHECK:   static func galileo<T>(_: T)