feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Deduplicate enclosing and nested instantiation

Browse Source 
Change-Id: Ib75e2d67acdf1fdbeb30b7c9689134f6ccf34063
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-04-09 17:26:19 +03:00
committed by Orgad Shaneh
parent 00845c0503
commit 548ec9c099
1 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/libs/cplusplus/LookupContext.cpp
View File

@@ -1308,8 +1308,8 @@ LookupScopePrivate *LookupScopePrivate::nestedType(
instantiation->_instantiationOrigin = origin; instantiation->_instantiationOrigin = origin;
// The instantiation should have all symbols, enums, and usings from the reference. // The instantiation should have all symbols, enums, and usings from the reference.
instantiation->_enums.append(reference->_enums); instantiation->_enums = reference->_enums;
instantiation->_usings.append(reference->_usings); instantiation->_usings = reference->_usings;
instantiation->_rootClass = reference->_rootClass; instantiation->_rootClass = reference->_rootClass;
@@ -1349,28 +1349,6 @@ LookupScopePrivate *LookupScopePrivate::nestedType(
subst.bind(cloner.name(name, &subst), ty); subst.bind(cloner.name(name, &subst), ty);
} }
foreach (Symbol *s, reference->_symbols) {
Symbol *clone = cloner.symbol(s, &subst);
clone->setEnclosingScope(s->enclosingScope());
instantiation->_symbols.append(clone);
if (Q_UNLIKELY(debug)) {
Overview oo;
oo.showFunctionSignatures = true;
oo.showReturnTypes = true;
oo.showTemplateParameters = true;
qDebug() << "cloned" << oo(clone->type());
if (Class *klass = clone->asClass()) {
const unsigned klassMemberCount = klass->memberCount();
for (unsigned i = 0; i < klassMemberCount; ++i){
Symbol *klassMemberAsSymbol = klass->memberAt(i);
if (klassMemberAsSymbol->isTypedef()) {
if (Declaration *declaration = klassMemberAsSymbol->asDeclaration())
qDebug() << "Member: " << oo(declaration->type(), declaration->name());
}
}
}
}
}
Instantiator instantiator(cloner, subst); Instantiator instantiator(cloner, subst);
instantiator.instantiate(reference, instantiation); instantiator.instantiate(reference, instantiation);
} else { } else {
@@ -1493,6 +1471,31 @@ void Instantiator::instantiate(LookupScopePrivate *lookupScope,
if (_alreadyConsideredInstantiations.contains(lookupScope)) if (_alreadyConsideredInstantiations.contains(lookupScope))
return; return;
_alreadyConsideredInstantiations.insert(lookupScope); _alreadyConsideredInstantiations.insert(lookupScope);
if (instantiation != lookupScope) {
foreach (Symbol *s, lookupScope->_symbols) {
Symbol *clone = _cloner.symbol(s, &_subst);
if (!clone->enclosingScope()) // Not from the cache but just cloned.
clone->setEnclosingScope(s->enclosingScope());
instantiation->_symbols.append(clone);
if (Q_UNLIKELY(debug)) {
Overview oo;
oo.showFunctionSignatures = true;
oo.showReturnTypes = true;
oo.showTemplateParameters = true;
qDebug() << "cloned" << oo(clone->type());
if (Class *klass = clone->asClass()) {
const unsigned klassMemberCount = klass->memberCount();
for (unsigned i = 0; i < klassMemberCount; ++i){
Symbol *klassMemberAsSymbol = klass->memberAt(i);
if (klassMemberAsSymbol->isTypedef()) {
if (Declaration *declaration = klassMemberAsSymbol->asDeclaration())
qDebug() << "Member: " << oo(declaration->type(), declaration->name());
}
}
}
}
}
}
auto cit = lookupScope->_nestedScopes.begin(); auto cit = lookupScope->_nestedScopes.begin();
for (; cit != lookupScope->_nestedScopes.end(); ++cit) { for (; cit != lookupScope->_nestedScopes.end(); ++cit) {
const Name *nestedName = cit->first; const Name *nestedName = cit->first;
@@ -1500,18 +1503,12 @@ void Instantiator::instantiate(LookupScopePrivate *lookupScope,
LookupScopePrivate *nestedInstantiation = nestedLookupScope; LookupScopePrivate *nestedInstantiation = nestedLookupScope;
nestedLookupScope->flush(); nestedLookupScope->flush();
if (isInstantiationNeeded(nestedLookupScope)) { const bool instantiationNeeded = isInstantiationNeeded(nestedInstantiation);
if (instantiationNeeded) {
nestedInstantiation = nestedLookupScope->allocateChild(nestedName); nestedInstantiation = nestedLookupScope->allocateChild(nestedName);
nestedInstantiation->_enums.append(nestedLookupScope->_enums); nestedInstantiation->_enums = nestedLookupScope->_enums;
nestedInstantiation->_usings.append(nestedLookupScope->_usings); nestedInstantiation->_usings = nestedLookupScope->_usings;
nestedInstantiation->_instantiationOrigin = nestedLookupScope; nestedInstantiation->_instantiationOrigin = nestedLookupScope;
foreach (Symbol *s, nestedLookupScope->_symbols) {
Symbol *clone = _cloner.symbol(s, &_subst);
if (!clone->enclosingScope()) // Not from the cache but just cloned.
clone->setEnclosingScope(s->enclosingScope());
nestedInstantiation->_symbols.append(clone);
}
} }
if (isNestedInstantiationEnclosingTemplate(nestedInstantiation, lookupScope)) if (isNestedInstantiationEnclosingTemplate(nestedInstantiation, lookupScope))