diff --git a/libcxxabi/src/demangle/ItaniumDemangle.h b/libcxxabi/src/demangle/ItaniumDemangle.h
--- a/libcxxabi/src/demangle/ItaniumDemangle.h
+++ b/libcxxabi/src/demangle/ItaniumDemangle.h
@@ -32,83 +32,83 @@
 #include <limits>
 #include <utility>
 
-#define FOR_EACH_NODE_KIND(X) \
-    X(NodeArrayNode) \
-    X(DotSuffix) \
-    X(VendorExtQualType) \
-    X(QualType) \
-    X(ConversionOperatorType) \
-    X(PostfixQualifiedType) \
-    X(ElaboratedTypeSpefType) \
-    X(NameType) \
-    X(AbiTagAttr) \
-    X(EnableIfAttr) \
-    X(ObjCProtoName) \
-    X(PointerType) \
-    X(ReferenceType) \
-    X(PointerToMemberType) \
-    X(ArrayType) \
-    X(FunctionType) \
-    X(NoexceptSpec) \
-    X(DynamicExceptionSpec) \
-    X(FunctionEncoding) \
-    X(LiteralOperator) \
-    X(SpecialName) \
-    X(CtorVtableSpecialName) \
-    X(QualifiedName) \
-    X(NestedName) \
-    X(LocalName) \
-    X(VectorType) \
-    X(PixelVectorType) \
-    X(BinaryFPType) \
-    X(SyntheticTemplateParamName) \
-    X(TypeTemplateParamDecl) \
-    X(NonTypeTemplateParamDecl) \
-    X(TemplateTemplateParamDecl) \
-    X(TemplateParamPackDecl) \
-    X(ParameterPack) \
-    X(TemplateArgumentPack) \
-    X(ParameterPackExpansion) \
-    X(TemplateArgs) \
-    X(ForwardTemplateReference) \
-    X(NameWithTemplateArgs) \
-    X(GlobalQualifiedName) \
-    X(ExpandedSpecialSubstitution) \
-    X(SpecialSubstitution) \
-    X(CtorDtorName) \
-    X(DtorName) \
-    X(UnnamedTypeName) \
-    X(ClosureTypeName) \
-    X(StructuredBindingName) \
-    X(BinaryExpr) \
-    X(ArraySubscriptExpr) \
-    X(PostfixExpr) \
-    X(ConditionalExpr) \
-    X(MemberExpr) \
-    X(SubobjectExpr) \
-    X(EnclosingExpr) \
-    X(CastExpr) \
-    X(SizeofParamPackExpr) \
-    X(CallExpr) \
-    X(NewExpr) \
-    X(DeleteExpr) \
-    X(PrefixExpr) \
-    X(FunctionParam) \
-    X(ConversionExpr) \
-    X(PointerToMemberConversionExpr) \
-    X(InitListExpr) \
-    X(FoldExpr) \
-    X(ThrowExpr) \
-    X(BoolExpr) \
-    X(StringLiteral) \
-    X(LambdaExpr) \
-    X(EnumLiteral)    \
-    X(IntegerLiteral) \
-    X(FloatLiteral) \
-    X(DoubleLiteral) \
-    X(LongDoubleLiteral) \
-    X(BracedExpr) \
-    X(BracedRangeExpr)
+#define FOR_EACH_NODE_KIND(X)                                                  \
+  X(NodeArrayNode)                                                             \
+  X(DotSuffix)                                                                 \
+  X(VendorExtQualType)                                                         \
+  X(QualType)                                                                  \
+  X(ConversionOperatorType)                                                    \
+  X(PostfixQualifiedType)                                                      \
+  X(ElaboratedTypeSpefType)                                                    \
+  X(NameType)                                                                  \
+  X(AbiTagAttr)                                                                \
+  X(EnableIfAttr)                                                              \
+  X(ObjCProtoName)                                                             \
+  X(PointerType)                                                               \
+  X(ReferenceType)                                                             \
+  X(PointerToMemberType)                                                       \
+  X(ArrayType)                                                                 \
+  X(FunctionType)                                                              \
+  X(NoexceptSpec)                                                              \
+  X(DynamicExceptionSpec)                                                      \
+  X(FunctionEncoding)                                                          \
+  X(LiteralOperator)                                                           \
+  X(SpecialName)                                                               \
+  X(CtorVtableSpecialName)                                                     \
+  X(QualifiedName)                                                             \
+  X(NestedName)                                                                \
+  X(LocalName)                                                                 \
+  X(VectorType)                                                                \
+  X(PixelVectorType)                                                           \
+  X(BinaryFPType)                                                              \
+  X(SyntheticTemplateParamName)                                                \
+  X(TypeTemplateParamDecl)                                                     \
+  X(NonTypeTemplateParamDecl)                                                  \
+  X(TemplateTemplateParamDecl)                                                 \
+  X(TemplateParamPackDecl)                                                     \
+  X(ParameterPack)                                                             \
+  X(TemplateArgumentPack)                                                      \
+  X(ParameterPackExpansion)                                                    \
+  X(TemplateArgs)                                                              \
+  X(ForwardTemplateReference)                                                  \
+  X(NameWithTemplateArgs)                                                      \
+  X(GlobalQualifiedName)                                                       \
+  X(ExpandedSpecialSubstitution)                                               \
+  X(SpecialSubstitution)                                                       \
+  X(CtorDtorName)                                                              \
+  X(DtorName)                                                                  \
+  X(UnnamedTypeName)                                                           \
+  X(ClosureTypeName)                                                           \
+  X(StructuredBindingName)                                                     \
+  X(BinaryExpr)                                                                \
+  X(ArraySubscriptExpr)                                                        \
+  X(PostfixExpr)                                                               \
+  X(ConditionalExpr)                                                           \
+  X(MemberExpr)                                                                \
+  X(SubobjectExpr)                                                             \
+  X(EnclosingExpr)                                                             \
+  X(CastExpr)                                                                  \
+  X(SizeofParamPackExpr)                                                       \
+  X(CallExpr)                                                                  \
+  X(NewExpr)                                                                   \
+  X(DeleteExpr)                                                                \
+  X(PrefixExpr)                                                                \
+  X(FunctionParam)                                                             \
+  X(ConversionExpr)                                                            \
+  X(PointerToMemberConversionExpr)                                             \
+  X(InitListExpr)                                                              \
+  X(FoldExpr)                                                                  \
+  X(ThrowExpr)                                                                 \
+  X(BoolExpr)                                                                  \
+  X(StringLiteral)                                                             \
+  X(LambdaExpr)                                                                \
+  X(EnumLiteral)                                                               \
+  X(IntegerLiteral)                                                            \
+  X(FloatLiteral)                                                              \
+  X(DoubleLiteral)                                                             \
+  X(LongDoubleLiteral)                                                         \
+  X(BracedExpr)                                                                \
+  X(BracedRangeExpr)
 
 DEMANGLE_NAMESPACE_BEGIN
 
diff --git a/llvm/include/llvm/Demangle/ItaniumDemangle.h b/llvm/include/llvm/Demangle/ItaniumDemangle.h
--- a/llvm/include/llvm/Demangle/ItaniumDemangle.h
+++ b/llvm/include/llvm/Demangle/ItaniumDemangle.h
@@ -32,83 +32,83 @@
 #include <limits>
 #include <utility>
 
-#define FOR_EACH_NODE_KIND(X) \
-    X(NodeArrayNode) \
-    X(DotSuffix) \
-    X(VendorExtQualType) \
-    X(QualType) \
-    X(ConversionOperatorType) \
-    X(PostfixQualifiedType) \
-    X(ElaboratedTypeSpefType) \
-    X(NameType) \
-    X(AbiTagAttr) \
-    X(EnableIfAttr) \
-    X(ObjCProtoName) \
-    X(PointerType) \
-    X(ReferenceType) \
-    X(PointerToMemberType) \
-    X(ArrayType) \
-    X(FunctionType) \
-    X(NoexceptSpec) \
-    X(DynamicExceptionSpec) \
-    X(FunctionEncoding) \
-    X(LiteralOperator) \
-    X(SpecialName) \
-    X(CtorVtableSpecialName) \
-    X(QualifiedName) \
-    X(NestedName) \
-    X(LocalName) \
-    X(VectorType) \
-    X(PixelVectorType) \
-    X(BinaryFPType) \
-    X(SyntheticTemplateParamName) \
-    X(TypeTemplateParamDecl) \
-    X(NonTypeTemplateParamDecl) \
-    X(TemplateTemplateParamDecl) \
-    X(TemplateParamPackDecl) \
-    X(ParameterPack) \
-    X(TemplateArgumentPack) \
-    X(ParameterPackExpansion) \
-    X(TemplateArgs) \
-    X(ForwardTemplateReference) \
-    X(NameWithTemplateArgs) \
-    X(GlobalQualifiedName) \
-    X(ExpandedSpecialSubstitution) \
-    X(SpecialSubstitution) \
-    X(CtorDtorName) \
-    X(DtorName) \
-    X(UnnamedTypeName) \
-    X(ClosureTypeName) \
-    X(StructuredBindingName) \
-    X(BinaryExpr) \
-    X(ArraySubscriptExpr) \
-    X(PostfixExpr) \
-    X(ConditionalExpr) \
-    X(MemberExpr) \
-    X(SubobjectExpr) \
-    X(EnclosingExpr) \
-    X(CastExpr) \
-    X(SizeofParamPackExpr) \
-    X(CallExpr) \
-    X(NewExpr) \
-    X(DeleteExpr) \
-    X(PrefixExpr) \
-    X(FunctionParam) \
-    X(ConversionExpr) \
-    X(PointerToMemberConversionExpr) \
-    X(InitListExpr) \
-    X(FoldExpr) \
-    X(ThrowExpr) \
-    X(BoolExpr) \
-    X(StringLiteral) \
-    X(LambdaExpr) \
-    X(EnumLiteral)    \
-    X(IntegerLiteral) \
-    X(FloatLiteral) \
-    X(DoubleLiteral) \
-    X(LongDoubleLiteral) \
-    X(BracedExpr) \
-    X(BracedRangeExpr)
+#define FOR_EACH_NODE_KIND(X)                                                  \
+  X(NodeArrayNode)                                                             \
+  X(DotSuffix)                                                                 \
+  X(VendorExtQualType)                                                         \
+  X(QualType)                                                                  \
+  X(ConversionOperatorType)                                                    \
+  X(PostfixQualifiedType)                                                      \
+  X(ElaboratedTypeSpefType)                                                    \
+  X(NameType)                                                                  \
+  X(AbiTagAttr)                                                                \
+  X(EnableIfAttr)                                                              \
+  X(ObjCProtoName)                                                             \
+  X(PointerType)                                                               \
+  X(ReferenceType)                                                             \
+  X(PointerToMemberType)                                                       \
+  X(ArrayType)                                                                 \
+  X(FunctionType)                                                              \
+  X(NoexceptSpec)                                                              \
+  X(DynamicExceptionSpec)                                                      \
+  X(FunctionEncoding)                                                          \
+  X(LiteralOperator)                                                           \
+  X(SpecialName)                                                               \
+  X(CtorVtableSpecialName)                                                     \
+  X(QualifiedName)                                                             \
+  X(NestedName)                                                                \
+  X(LocalName)                                                                 \
+  X(VectorType)                                                                \
+  X(PixelVectorType)                                                           \
+  X(BinaryFPType)                                                              \
+  X(SyntheticTemplateParamName)                                                \
+  X(TypeTemplateParamDecl)                                                     \
+  X(NonTypeTemplateParamDecl)                                                  \
+  X(TemplateTemplateParamDecl)                                                 \
+  X(TemplateParamPackDecl)                                                     \
+  X(ParameterPack)                                                             \
+  X(TemplateArgumentPack)                                                      \
+  X(ParameterPackExpansion)                                                    \
+  X(TemplateArgs)                                                              \
+  X(ForwardTemplateReference)                                                  \
+  X(NameWithTemplateArgs)                                                      \
+  X(GlobalQualifiedName)                                                       \
+  X(ExpandedSpecialSubstitution)                                               \
+  X(SpecialSubstitution)                                                       \
+  X(CtorDtorName)                                                              \
+  X(DtorName)                                                                  \
+  X(UnnamedTypeName)                                                           \
+  X(ClosureTypeName)                                                           \
+  X(StructuredBindingName)                                                     \
+  X(BinaryExpr)                                                                \
+  X(ArraySubscriptExpr)                                                        \
+  X(PostfixExpr)                                                               \
+  X(ConditionalExpr)                                                           \
+  X(MemberExpr)                                                                \
+  X(SubobjectExpr)                                                             \
+  X(EnclosingExpr)                                                             \
+  X(CastExpr)                                                                  \
+  X(SizeofParamPackExpr)                                                       \
+  X(CallExpr)                                                                  \
+  X(NewExpr)                                                                   \
+  X(DeleteExpr)                                                                \
+  X(PrefixExpr)                                                                \
+  X(FunctionParam)                                                             \
+  X(ConversionExpr)                                                            \
+  X(PointerToMemberConversionExpr)                                             \
+  X(InitListExpr)                                                              \
+  X(FoldExpr)                                                                  \
+  X(ThrowExpr)                                                                 \
+  X(BoolExpr)                                                                  \
+  X(StringLiteral)                                                             \
+  X(LambdaExpr)                                                                \
+  X(EnumLiteral)                                                               \
+  X(IntegerLiteral)                                                            \
+  X(FloatLiteral)                                                              \
+  X(DoubleLiteral)                                                             \
+  X(LongDoubleLiteral)                                                         \
+  X(BracedExpr)                                                                \
+  X(BracedRangeExpr)
 
 DEMANGLE_NAMESPACE_BEGIN