C++: Simplify template function resolving a bit

There's no reason to keep the Template after it is instantiated.

Change-Id: I91210ae11b3420bb038168fe951b52d28ccc132e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

2 files changed, 1 insertions, 9 deletions

diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index a8fce052db..88c75919db 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -2104,7 +2104,7 @@ Symbol *CreateBindings::instantiateTemplateFunction(const TemplateNameId *instan
 
         subst.bind(cloner.name(name, &subst), ty);
     }
-    return cloner.symbol(specialization, &subst);
+    return cloner.symbol(specialization->declaration(), &subst);
 }
 
 } // namespace CPlusPlus
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index 7612e7f51d..43887b2995 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -679,14 +679,6 @@ bool ResolveExpression::visit(CallAST *ast)
             // Constructor call
             FullySpecifiedType ctorTy = control()->namedType(classTy->name());
             addResult(ctorTy, scope);
-        } else if (Template *templateTy = ty->asTemplateType()) {
-            // template function
-            if (Symbol *declaration = templateTy->declaration()) {
-                if (Function *funTy = declaration->asFunction()) {
-                    if (maybeValidPrototype(funTy, actualArgumentCount))
-                        addResult(funTy->returnType().simplified(), scope);
-                }
-            }
         }
     }