1 files changed, 17 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp
index b401db21a82..56df8bab9ba 100644
--- a/clang/lib/Sema/SemaTemplateDeduction.cpp
+++ b/clang/lib/Sema/SemaTemplateDeduction.cpp
@@ -3538,6 +3538,23 @@ Sema::DeduceTemplateArguments(FunctionTemplateDecl *FunctionTemplate,
   TemplateParameterList *TemplateParams
     = FunctionTemplate->getTemplateParameters();
   QualType FunctionType = Function->getType();
+  if (!InOverloadResolution && !ArgFunctionType.isNull()) {
+    const FunctionProtoType *FunctionTypeP =
+        FunctionType->castAs<FunctionProtoType>();
+    CallingConv CC = FunctionTypeP->getCallConv();
+    bool NoReturn = FunctionTypeP->getNoReturnAttr();
+    const FunctionProtoType *ArgFunctionTypeP =
+        ArgFunctionType->getAs<FunctionProtoType>();
+    if (ArgFunctionTypeP->getCallConv() != CC ||
+        ArgFunctionTypeP->getNoReturnAttr() != NoReturn) {
+      FunctionType::ExtInfo EI =
+          ArgFunctionTypeP->getExtInfo().withCallingConv(CC);
+      EI = EI.withNoReturn(NoReturn);
+      ArgFunctionTypeP = cast<FunctionProtoType>(
+          Context.adjustFunctionType(ArgFunctionTypeP, EI));
+      ArgFunctionType = QualType(ArgFunctionTypeP, 0);
+    }
+  }
 
   // Substitute any explicit template arguments.
   LocalInstantiationScope InstScope(*this);