Switch getAs to castAs (didn't know about this before!) and simplify

some code.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@130665 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/Type.h b/include/clang/AST/Type.h
index 77d704126c6eaf94e23e337c648e6432858813df..975a66fefa89814a066386b87c097f989fa94dd9 100644 (file)
--- a/include/clang/AST/Type.h
+++ b/include/clang/AST/Type.h
@@ -2989,7 +2989,7 @@ class TemplateTypeParmType : public Type, public llvm::FoldingSetNode {
   TemplateTypeParmType(TemplateTypeParmDecl *TTPDecl, QualType Canon)
     : Type(TemplateTypeParm, Canon, /*Dependent=*/true,
            /*VariablyModified=*/false,
-           Canon->getAs<TemplateTypeParmType>()->CanTTPTInfo.ParameterPack),
+           Canon->containsUnexpandedParameterPack()),
       TTPDecl(TTPDecl) { }
 
   /// Build the canonical type.
@@ -3005,7 +3005,7 @@ class TemplateTypeParmType : public Type, public llvm::FoldingSetNode {
 
   const CanonicalTTPTInfo& getCanTTPTInfo() const {
     QualType Can = getCanonicalTypeInternal();
-    return Can->getAs<TemplateTypeParmType>()->CanTTPTInfo;
+    return Can->castAs<TemplateTypeParmType>()->CanTTPTInfo;
   }
 
 public: