4 files changed, 39 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/Templates.cpp b/src/libs/3rdparty/cplusplus/Templates.cpp
index b813600143..5edef37c7f 100644
--- a/src/libs/3rdparty/cplusplus/Templates.cpp
+++ b/src/libs/3rdparty/cplusplus/Templates.cpp
@@ -408,6 +408,11 @@ void CloneName::visit(const Identifier *name)
     _name = _control->identifier(name->chars(), name->size());
 }
 
+void CloneName::visit(const AnonymousNameId *name)
+{
+    _name = _control->anonymousNameId(name->classTokenIndex());
+}
+
 void CloneName::visit(const TemplateNameId *name)
 {
     std::vector<FullySpecifiedType> args(name->templateArgumentCount());
diff --git a/src/libs/3rdparty/cplusplus/Templates.h b/src/libs/3rdparty/cplusplus/Templates.h
index 2784f02d7f..f2b5b9a367 100644
--- a/src/libs/3rdparty/cplusplus/Templates.h
+++ b/src/libs/3rdparty/cplusplus/Templates.h
@@ -109,6 +109,7 @@ public:
 
 protected:
     virtual void visit(const Identifier *name);
+    virtual void visit(const AnonymousNameId *name);
     virtual void visit(const TemplateNameId *name);
     virtual void visit(const DestructorNameId *name);
     virtual void visit(const OperatorNameId *name);
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index d231f6f317..385777de30 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -2015,3 +2015,35 @@ void CppToolsPlugin::test_completion_type_and_using_declaration_data()
             << code << completions;
 
 }
+
+void CppToolsPlugin::test_completion_instantiate_template_with_anonymous_class()
+{
+    TestData data;
+    data.srcText =
+            "template <typename T>\n"
+            "struct S\n"
+            "{\n"
+            "    union { int i; char c; };\n"
+            "};\n"
+            "void fun()\n"
+            "{\n"
+            "   S<int> s;\n"
+            "   @\n"
+            "   // padding so we get the scope right\n"
+            "}\n"
+
+            ;
+    setup(&data);
+
+    Utils::ChangeSet change;
+    QString txt = QLatin1String("s.");
+    change.insert(data.pos, txt);
+    QTextCursor cursor(data.doc);
+    change.apply(&cursor);
+    data.pos += txt.length();
+
+    QStringList completions = getCompletions(data);
+
+    QCOMPARE(completions.size(), 1);
+    QVERIFY(completions.contains(QLatin1String("S")));
+}
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index 37e06524fd..dd925121c1 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -126,6 +126,7 @@ private slots:
     void test_completion_QTCREATORBUG9098();
     void test_completion_type_and_using_declaration();
     void test_completion_type_and_using_declaration_data();
+    void test_completion_instantiate_template_with_anonymous_class();
 
     void test_format_pointerdeclaration_in_simpledeclarations();
     void test_format_pointerdeclaration_in_simpledeclarations_data();