1 files changed, 53 insertions, 34 deletions

diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp
index 574f7f6359..82e9186feb 100644
--- a/src/libs/cplusplus/LookupContext.cpp
+++ b/src/libs/cplusplus/LookupContext.cpp
@@ -1144,9 +1144,29 @@ LookupScope *LookupScopePrivate::lookupType_helper(
     return 0;
 }
 
-static LookupScopePrivate *findSpecializationWithMatchingTemplateArgument(
-        const Name *argumentName, LookupScopePrivate *reference)
+static const NamedType *dereference(const FullySpecifiedType &type)
+{
+    FullySpecifiedType ty = type;
+    forever {
+        if (PointerType *pointer = ty->asPointerType())
+            ty = pointer->elementType();
+        else if (ReferenceType *reference = ty->asReferenceType())
+            ty = reference->elementType();
+        else if (ArrayType *array = ty->asArrayType())
+            ty = array->elementType();
+        else if (const NamedType *namedType = ty->asNamedType())
+            return namedType;
+        else
+            break;
+    }
+    return 0;
+}
+
+static bool findTemplateArgument(const NamedType *namedType, LookupScopePrivate *reference)
 {
+    if (!namedType)
+        return false;
+    const Name *argumentName = namedType->name();
     foreach (Symbol *s, reference->_symbols) {
         if (Class *clazz = s->asClass()) {
             if (Template *templateSpecialization = clazz->enclosingTemplate()) {
@@ -1157,14 +1177,28 @@ static LookupScopePrivate *findSpecializationWithMatchingTemplateArgument(
                             = templateSpecialization->templateParameterAt(i)->asTypenameArgument()) {
                         if (const Name *name = tParam->name()) {
                             if (compareName(name, argumentName))
-                                return reference;
+                                return true;
                         }
                     }
                 }
             }
         }
     }
-    return 0;
+    return false;
+}
+
+static bool matchTypes(const FullySpecifiedType &instantiation,
+                       const FullySpecifiedType &specialization)
+{
+    if (specialization.match(instantiation))
+        return true;
+    if (const NamedType *specName = specialization->asNamedType()) {
+        if (const NamedType *initName = instantiation->asNamedType()) {
+            if (specName->name()->identifier()->match(initName->name()->identifier()))
+                return true;
+        }
+    }
+    return false;
 }
 
 LookupScopePrivate *LookupScopePrivate::findSpecialization(
@@ -1172,7 +1206,6 @@ LookupScopePrivate *LookupScopePrivate::findSpecialization(
         const TemplateNameIdTable &specializations,
         LookupScopePrivate *origin)
 {
-    // we go through all specialization and try to find that one with template argument as pointer
     for (TemplateNameIdTable::const_iterator cit = specializations.begin();
          cit != specializations.end(); ++cit) {
         const TemplateNameId *specializationNameId = cit->first;
@@ -1183,45 +1216,31 @@ LookupScopePrivate *LookupScopePrivate::findSpecialization(
         // and initialization(in future it should be more clever)
         if (specializationTemplateArgumentCount != initializationTemplateArgumentCount)
             continue;
-        for (unsigned i = 0; i < initializationTemplateArgumentCount; ++i) {
+        bool match = true;
+        for (unsigned i = 0; i < initializationTemplateArgumentCount && match; ++i) {
             const FullySpecifiedType &specializationTemplateArgument
                     = specializationNameId->templateArgumentAt(i);
             FullySpecifiedType initializationTemplateArgument = templId->templateArgumentAt(i);
             TypeResolver typeResolver(*_factory);
             Scope *scope = 0;
             typeResolver.resolve(&initializationTemplateArgument, &scope, origin ? origin->q : 0);
-            PointerType *specPointer = specializationTemplateArgument.type()->asPointerType();
             // specialization and initialization argument have to be a pointer
             // additionally type of pointer argument of specialization has to be namedType
-            if (specPointer && initializationTemplateArgument.type()->isPointerType()
-                    && specPointer->elementType().type()->isNamedType()) {
-                return cit->second;
-            }
-
-            ArrayType *specArray = specializationTemplateArgument.type()->asArrayType();
-            if (specArray && initializationTemplateArgument.type()->isArrayType()) {
-                if (const NamedType *argumentNamedType
-                        = specArray->elementType().type()->asNamedType()) {
-                    if (const Name *argumentName = argumentNamedType->name()) {
-                        if (LookupScopePrivate *reference
-                                = findSpecializationWithMatchingTemplateArgument(
-                                    argumentName, cit->second)) {
-                            return reference;
-                        }
-                    }
-                }
-            }
-
-            if (specializationTemplateArgument == initializationTemplateArgument)
-                return cit->second;
-
-            if (const NamedType *specName = specializationTemplateArgument->asNamedType()) {
-                if (const NamedType *initName = initializationTemplateArgument->asNamedType()) {
-                    if (specName->name()->identifier() == initName->name()->identifier())
-                        return cit->second;
-                }
+            if (findTemplateArgument(dereference(specializationTemplateArgument), cit->second)) {
+                if (specializationTemplateArgument->isPointerType())
+                    match = initializationTemplateArgument->isPointerType();
+                else if (specializationTemplateArgument->isReferenceType())
+                    match = initializationTemplateArgument->isReferenceType();
+                else if (specializationTemplateArgument->isArrayType())
+                    match = initializationTemplateArgument->isArrayType();
+                // Do not try exact match (typename T != class T {};)
+            } else {
+                // Real type specialization
+                match = matchTypes(initializationTemplateArgument, specializationTemplateArgument);
             }
         }
+        if (match)
+            return cit->second;
     }
 
     return 0;