C++: fix cloning of templates

Fix instantiation of templates(by cloning original symbols). Assigning of scope
for cloned symbol is taken from the symbol which is used to instantiate.

Task-number: QTCREATORBUG-9098
Change-Id: I066cc8b5f69333fabdaf2d4466b205baf08bd3f1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

src/libs/3rdparty/cplusplus/Symbol.cpp

@@ -105,7 +105,7 @@ Symbol::Symbol(TranslationUnit *translationUnit, unsigned sourceLocation, const
 
 Symbol::Symbol(Clone *clone, Subst *subst, Symbol *original)
     : _name(clone->name(original->_name, subst)),
-      _scope(original->_scope),
+      _scope(0),
       _next(0),
       _fileId(clone->control()->stringLiteral(original->fileName(), original->fileNameLength())),
       _sourceLocation(original->_sourceLocation),
@@ -296,6 +296,11 @@ Block *Symbol::enclosingBlock() const
     return 0;
 }
 
+Scope *Symbol::scope() const
+{
+    return _scope;
+}
+
 unsigned Symbol::index() const
 { return _index; }
 

src/libs/3rdparty/cplusplus/Symbol.h

@@ -290,6 +290,7 @@ public:
     /// Returns the enclosing Block scope.
     Block *enclosingBlock() const;
 
+    Scope *scope() const;
     void setScope(Scope *enclosingScope); // ### make me private
     void resetScope(); // ### make me private
     void setSourceLocation(unsigned sourceLocation, TranslationUnit *translationUnit); // ### make me private