Fix a problem that Eli noticed, and that Doug helped me fix.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75265 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
index d5dd776..78c3b78 100644
--- a/lib/AST/Type.cpp
+++ b/lib/AST/Type.cpp
@@ -124,8 +124,10 @@
return TOE->getUnderlyingExpr()->getType().getDesugaredType();
if (const TypeOfType *TOT = dyn_cast<TypeOfType>(this))
return TOT->getUnderlyingType().getDesugaredType();
- if (const DecltypeType *DTT = dyn_cast<DecltypeType>(this))
- return DTT->getCanonicalTypeInternal();
+ if (const DecltypeType *DTT = dyn_cast<DecltypeType>(this)) {
+ if (!DTT->getUnderlyingType()->isDependentType())
+ return DTT->getUnderlyingType().getDesugaredType();
+ }
if (const TemplateSpecializationType *Spec
= dyn_cast<TemplateSpecializationType>(this)) {
if (ForDisplay)
@@ -1074,8 +1076,9 @@
: Type(TypeOfExpr, can, E->isTypeDependent()), TOExpr(E) {
}
-DecltypeType::DecltypeType(Expr *E, QualType can)
- : Type(Decltype, can, E->isTypeDependent()), E(E) {
+DecltypeType::DecltypeType(Expr *E, QualType underlyingType, QualType can)
+ : Type(Decltype, can, E->isTypeDependent()), E(E),
+ UnderlyingType(underlyingType) {
}
TagType::TagType(TypeClass TC, TagDecl *D, QualType can)