commit 4576a77b809649f5b8d0ff8c7a4be57eeee0ecf9
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Sep 10 06:35:32 2018 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Sep 10 06:35:32 2018 +0000
tree 26b3a2987ae7f0dfcbf7e3c0d0e34ac246a547cb
parent 4d10ba37b93755fa7a843e24b92f9bfc5b1b805d

PR33222: Require the declared return type not the actual return type to
match when checking for redeclaration of a function template.

This properly handles differences in deduced return types, particularly
when performing redeclaration checks for a friend function template.

llvm-svn: 341778

clang/lib/Sema/SemaOverload.cpp

diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index cb80a69..35636e7 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -1105,7 +1105,8 @@
       (!TemplateParameterListsAreEqual(NewTemplate->getTemplateParameters(),
                                        OldTemplate->getTemplateParameters(),
                                        false, TPL_TemplateMatch) ||
-       OldType->getReturnType() != NewType->getReturnType()))
+       !Context.hasSameType(Old->getDeclaredReturnType(),
+                            New->getDeclaredReturnType())))
     return true;
 
   // If the function is a class member, its signature includes the