maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Avoid an unnecessary recursive loop between type canonicalization and NNS canonicalization which would (rarely) lead to memory corruption. While I'm here, simplify. Fixes PR12166. Not committing a testcase because it's impossible to reduce it. 

llvm-svn: 151967
This commit is contained in:
Eli Friedman 2012-03-03 04:09:56 +00:00
parent 89fd064582
commit 5358a0ab5a
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clang/lib/AST/ASTContext.cpp
View File

@ -3376,26 +3376,13 @@ ASTContext::getCanonicalNestedNameSpecifier(NestedNameSpecifier *NNS) const {
// types, e.g.,
// typedef typename T::type T1;
// typedef typename T1::type T2;
if (const DependentNameType *DNT = T->getAs<DependentNameType>()) {
NestedNameSpecifier *Prefix
= getCanonicalNestedNameSpecifier(DNT->getQualifier());
return NestedNameSpecifier::Create(*this, Prefix,
if (const DependentNameType *DNT = T->getAs<DependentNameType>())
return NestedNameSpecifier::Create(*this, DNT->getQualifier(),
const_cast<IdentifierInfo *>(DNT->getIdentifier()));
}
// Do the same thing as above, but with dependent-named specializations.
if (const DependentTemplateSpecializationType *DTST
= T->getAs<DependentTemplateSpecializationType>()) {
NestedNameSpecifier *Prefix
= getCanonicalNestedNameSpecifier(DTST->getQualifier());
T = getDependentTemplateSpecializationType(DTST->getKeyword(),
Prefix, DTST->getIdentifier(),
DTST->getNumArgs(),
DTST->getArgs());
T = getCanonicalType(T);
}
// Otherwise, just canonicalize the type, and force it to be a TypeSpec.
// FIXME: Why are TypeSpec and TypeSpecWithTemplate distinct in the
// first place?
return NestedNameSpecifier::Create(*this, 0, false,
const_cast<Type*>(T.getTypePtr()));
}