diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-07-15 23:30:50 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-07-15 23:30:50 +0000 |
| commit | 912394028ddd1934d40ad3d44c6655472cae9ef7 (patch) | |
| tree | 46f30d64a92cf691001ec340aad3a35c241a1821 /lib/AST/Type.cpp | |
| parent | f5baeb4af53b79a0d92a4ab7b7eba19bd721f344 (diff) | |
Revert change accidentally committed in r160240.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@160241 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/Type.cpp')
| -rw-r--r-- | lib/AST/Type.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp index eacf505442..4fef11f2a8 100644 --- a/lib/AST/Type.cpp +++ b/lib/AST/Type.cpp @@ -1862,7 +1862,8 @@ TemplateSpecializationType(TemplateName T, Canon.isNull()? T.isDependent() : Canon->isInstantiationDependentType(), false, - T.containsUnexpandedParameterPack()), + Canon.isNull()? T.containsUnexpandedParameterPack() + : Canon->containsUnexpandedParameterPack()), Template(T), NumArgs(NumArgs), TypeAlias(!AliasedType.isNull()) { assert(!T.getAsDependentTemplateName() && "Use DependentTemplateSpecializationType for dependent template-name"); @@ -1887,8 +1888,6 @@ TemplateSpecializationType(TemplateName T, // arguments is. Given: // template<typename T> using U = int; // U<T> is always non-dependent, irrespective of the type T. - // However, U<Ts> contains an unexpanded parameter pack, even though - // its expansion (and thus its desugared type) doesn't. if (Canon.isNull() && Args[Arg].isDependent()) setDependent(); else if (Args[Arg].isInstantiationDependent()) @@ -1897,7 +1896,7 @@ TemplateSpecializationType(TemplateName T, if (Args[Arg].getKind() == TemplateArgument::Type && Args[Arg].getAsType()->isVariablyModifiedType()) setVariablyModified(); - if (Args[Arg].containsUnexpandedParameterPack()) + if (Canon.isNull() && Args[Arg].containsUnexpandedParameterPack()) setContainsUnexpandedParameterPack(); new (&TemplateArgs[Arg]) TemplateArgument(Args[Arg]); |