Fix tests

Author: zyn0217

clang/include/clang/AST/ASTContext.h

@@ -1728,11 +1728,12 @@ class ASTContext : public RefCountedBase<ASTContext> {
       QualType Wrapped, QualType Contained,
       const HLSLAttributedResourceType::Attributes &Attrs);
 
-  QualType getSubstTemplateTypeParmType(
-      QualType Replacement, Decl *AssociatedDecl, unsigned Index,
-      std::optional<unsigned> PackIndex,
-      SubstTemplateTypeParmTypeFlag Flag =
-          SubstTemplateTypeParmTypeFlag::ExpandPacksInPlace) const;
+  QualType
+  getSubstTemplateTypeParmType(QualType Replacement, Decl *AssociatedDecl,
+                               unsigned Index,
+                               std::optional<unsigned> PackIndex,
+                               SubstTemplateTypeParmTypeFlag Flag =
+                                   SubstTemplateTypeParmTypeFlag::None) const;
   QualType getSubstTemplateTypeParmPackType(Decl *AssociatedDecl,
                                             unsigned Index, bool Final,
                                             const TemplateArgument &ArgPack);

clang/include/clang/AST/Type.h

@@ -6457,8 +6457,9 @@ class SubstTemplateTypeParmType final
     ID.AddInteger(Index);
     ID.AddInteger(PackIndex ? *PackIndex - 1 : 0);
     ID.AddInteger(llvm::to_underlying(Flag));
-    assert(Flag != SubstTemplateTypeParmTypeFlag::ExpandPacksInPlace ||
-           PackIndex && "ExpandPacksInPlace needs a valid PackIndex");
+    assert((Flag != SubstTemplateTypeParmTypeFlag::ExpandPacksInPlace ||
+            PackIndex) &&
+           "ExpandPacksInPlace needs a valid PackIndex");
   }
 
   static bool classof(const Type *T) {

clang/lib/AST/Type.cpp

@@ -4206,8 +4206,9 @@ SubstTemplateTypeParmType::SubstTemplateTypeParmType(
   SubstTemplateTypeParmTypeBits.Index = Index;
   SubstTemplateTypeParmTypeBits.PackIndex = PackIndex ? *PackIndex + 1 : 0;
   SubstTemplateTypeParmTypeBits.SubstitutionFlag = llvm::to_underlying(Flag);
-  assert(Flag != SubstTemplateTypeParmTypeFlag::ExpandPacksInPlace ||
-         PackIndex && "ExpandPacksInPlace needs a valid PackIndex");
+  assert((Flag != SubstTemplateTypeParmTypeFlag::ExpandPacksInPlace ||
+          PackIndex) &&
+         "ExpandPacksInPlace needs a valid PackIndex");
   assert(AssociatedDecl != nullptr);
 }