https://github.com/tmatheson-arm created
https://github.com/llvm/llvm-project/pull/125063
- Rename AArch64SVEACLETypes.def to AArch64Types.def
- Remove string literals from the macro calls
- Rename macros so that the hierarchy makes sense
>From 63159e8e82b56850213fb0e2479bd708f008ea81 Mon Sep 17 00:00:00 2001
From: Tomas Matheson <tomas.mathe...@arm.com>
Date: Wed, 22 Jan 2025 11:11:33 +0000
Subject: [PATCH 1/4] [NFC] rename AArch64SVEACLETypes.def to AArch64Types.def
This file also defines NEON types.
---
clang/include/clang/AST/ASTContext.h | 2 +-
clang/include/clang/AST/Type.h | 2 +-
clang/include/clang/AST/TypeProperties.td | 2 +-
.../{AArch64SVEACLETypes.def => AArch64Types.def} | 0
clang/include/clang/Serialization/ASTBitCodes.h | 2 +-
clang/include/module.modulemap | 2 +-
clang/lib/AST/ASTContext.cpp | 12 ++++++------
clang/lib/AST/ASTImporter.cpp | 2 +-
clang/lib/AST/ExprConstant.cpp | 2 +-
clang/lib/AST/ItaniumMangle.cpp | 2 +-
clang/lib/AST/MicrosoftMangle.cpp | 2 +-
clang/lib/AST/NSAPI.cpp | 2 +-
clang/lib/AST/PrintfFormatString.cpp | 2 +-
clang/lib/AST/Type.cpp | 6 +++---
clang/lib/AST/TypeLoc.cpp | 2 +-
clang/lib/CodeGen/CGDebugInfo.cpp | 2 +-
clang/lib/CodeGen/CodeGenTypes.cpp | 2 +-
clang/lib/CodeGen/ItaniumCXXABI.cpp | 2 +-
clang/lib/CodeGen/Targets/AArch64.cpp | 2 +-
clang/lib/Index/USRGeneration.cpp | 2 +-
clang/lib/Sema/Sema.cpp | 2 +-
clang/lib/Sema/SemaExpr.cpp | 4 ++--
clang/lib/Serialization/ASTCommon.cpp | 2 +-
clang/lib/Serialization/ASTReader.cpp | 2 +-
clang/tools/libclang/CIndex.cpp | 2 +-
.../Plugins/TypeSystem/Clang/TypeSystemClang.cpp | 2 +-
26 files changed, 33 insertions(+), 33 deletions(-)
rename clang/include/clang/Basic/{AArch64SVEACLETypes.def => AArch64Types.def}
(100%)
diff --git a/clang/include/clang/AST/ASTContext.h
b/clang/include/clang/AST/ASTContext.h
index 4e9b961688d559..d7066e341cfe05 100644
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -1204,7 +1204,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
#include "clang/Basic/OpenCLExtensionTypes.def"
#define SVE_TYPE(Name, Id, SingletonId) \
CanQualType SingletonId;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
CanQualType Id##Ty;
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h
index 3457d524c63aaa..983b710df7161c 100644
--- a/clang/include/clang/AST/Type.h
+++ b/clang/include/clang/AST/Type.h
@@ -3042,7 +3042,7 @@ class BuiltinType : public Type {
#include "clang/Basic/OpenCLExtensionTypes.def"
// SVE Types
#define SVE_TYPE(Name, Id, SingletonId) Id,
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
// PPC MMA Types
#define PPC_VECTOR_TYPE(Name, Id, Size) Id,
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/include/clang/AST/TypeProperties.td
b/clang/include/clang/AST/TypeProperties.td
index 6f1a76bd18fb50..f6521ca3a32cd6 100644
--- a/clang/include/clang/AST/TypeProperties.td
+++ b/clang/include/clang/AST/TypeProperties.td
@@ -886,7 +886,7 @@ let Class = BuiltinType in {
#define SVE_TYPE(NAME, ID, SINGLETON_ID) \
case BuiltinType::ID: return ctx.SINGLETON_ID;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(NAME, ID, SIZE) \
case BuiltinType::ID: return ctx.ID##Ty;
diff --git a/clang/include/clang/Basic/AArch64SVEACLETypes.def
b/clang/include/clang/Basic/AArch64Types.def
similarity index 100%
rename from clang/include/clang/Basic/AArch64SVEACLETypes.def
rename to clang/include/clang/Basic/AArch64Types.def
diff --git a/clang/include/clang/Serialization/ASTBitCodes.h
b/clang/include/clang/Serialization/ASTBitCodes.h
index d568d2fd7aa301..05d1cf1fd5cdb6 100644
--- a/clang/include/clang/Serialization/ASTBitCodes.h
+++ b/clang/include/clang/Serialization/ASTBitCodes.h
@@ -1129,7 +1129,7 @@ enum PredefinedTypeIDs {
#include "clang/Basic/OpenCLExtensionTypes.def"
// \brief SVE types with auto numeration
#define SVE_TYPE(Name, Id, SingletonId) PREDEF_TYPE_##Id##_ID,
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
// \brief PowerPC MMA types with auto numeration
#define PPC_VECTOR_TYPE(Name, Id, Size) PREDEF_TYPE_##Id##_ID,
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/include/module.modulemap b/clang/include/module.modulemap
index f00dede7fd526c..c9ef7da7a05e29 100644
--- a/clang/include/module.modulemap
+++ b/clang/include/module.modulemap
@@ -36,7 +36,7 @@ module Clang_Basic {
requires cplusplus
umbrella "clang/Basic"
- textual header "clang/Basic/AArch64SVEACLETypes.def"
+ textual header "clang/Basic/AArch64Types.def"
textual header "clang/Basic/AMDGPUTypes.def"
textual header "clang/Basic/BuiltinHeaders.def"
textual header "clang/Basic/BuiltinsAArch64.def"
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 155dbcfcaeed31..c19b50cf15b5f7 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -1442,7 +1442,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo
&Target,
(AuxTarget && AuxTarget->hasAArch64SVETypes())) {
#define SVE_TYPE(Name, Id, SingletonId) \
InitBuiltinType(SingletonId, BuiltinType::Id);
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
}
if (Target.getTriple().isPPC64()) {
@@ -2275,7 +2275,7 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const
{
Width = NumEls * ElBits * NF;
\
Align = NumEls * ElBits;
\
break;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size)
\
case BuiltinType::Id:
\
Width = Size;
\
@@ -3427,7 +3427,7 @@ static void encodeTypeForFunctionPointerAuth(const
ASTContext &Ctx,
#define SVE_TYPE(Name, Id, SingletonId)
\
case BuiltinType::Id:
\
return;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define HLSL_INTANGIBLE_TYPE(Name, Id, SingletonId)
\
case BuiltinType::Id:
\
return;
@@ -4404,7 +4404,7 @@ ASTContext::getBuiltinVectorTypeInfo(const BuiltinType
*Ty) const {
return {getIntTypeForBitwidth(ElBits, false),
\
llvm::ElementCount::getFixed(NumEls), NF};
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define RVV_VECTOR_TYPE_INT(Name, Id, SingletonId, NumEls, ElBits, NF,
\
IsSigned)
\
@@ -4470,7 +4470,7 @@ QualType ASTContext::getScalableVectorType(QualType
EltTy, unsigned NumElts,
return SingletonId;
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
} else if (Target->hasRISCVVTypes()) {
uint64_t EltTySize = getTypeSize(EltTy);
#define RVV_VECTOR_TYPE(Name, Id, SingletonId, NumEls, ElBits, NF, IsSigned,
\
@@ -8779,7 +8779,7 @@ static char getObjCEncodingForPrimitiveType(const
ASTContext *C,
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define RVV_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/RISCVVTypes.def"
#define WASM_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index 0669aa1b809c34..747b2599137a03 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -1123,7 +1123,7 @@ ExpectedType ASTNodeImporter::VisitBuiltinType(const
BuiltinType *T) {
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id: \
return Importer.getToContext().SingletonId;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id: \
return Importer.getToContext().Id##Ty;
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 2e680d1569f60f..d0ed3debfecced 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -12205,7 +12205,7 @@ GCCTypeClass EvaluateBuiltinClassifyType(QualType T,
case BuiltinType::OCLReserveID:
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp
index 1dd936cf4fb518..459b02201ac095 100644
--- a/clang/lib/AST/ItaniumMangle.cpp
+++ b/clang/lib/AST/ItaniumMangle.cpp
@@ -3438,7 +3438,7 @@ void CXXNameMangler::mangleType(const BuiltinType *T) {
type_name = MangledName;
\
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
break;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size)
\
case BuiltinType::Id:
\
mangleVendorType(#Name);
\
diff --git a/clang/lib/AST/MicrosoftMangle.cpp
b/clang/lib/AST/MicrosoftMangle.cpp
index edeeaeaa9ae17c..b6412d48dbb072 100644
--- a/clang/lib/AST/MicrosoftMangle.cpp
+++ b/clang/lib/AST/MicrosoftMangle.cpp
@@ -2808,7 +2808,7 @@ void MicrosoftCXXNameMangler::mangleType(const
BuiltinType *T, Qualifiers,
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/AST/NSAPI.cpp b/clang/lib/AST/NSAPI.cpp
index 311fec32bbfa90..f24981ec0758b8 100644
--- a/clang/lib/AST/NSAPI.cpp
+++ b/clang/lib/AST/NSAPI.cpp
@@ -445,7 +445,7 @@ NSAPI::getNSNumberFactoryMethodKind(QualType T) const {
case BuiltinType::OCLReserveID:
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/AST/PrintfFormatString.cpp
b/clang/lib/AST/PrintfFormatString.cpp
index 2181591ba17902..8cbabdb31527d9 100644
--- a/clang/lib/AST/PrintfFormatString.cpp
+++ b/clang/lib/AST/PrintfFormatString.cpp
@@ -857,7 +857,7 @@ bool PrintfSpecifier::fixType(QualType QT, const
LangOptions &LangOpt,
#include "clang/Basic/OpenCLExtensionTypes.def"
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index caa0ac858a1bea..69446b01343295 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -2530,7 +2530,7 @@ bool Type::isSVESizelessBuiltinType() const {
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
return false;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
default:
return false;
}
@@ -3485,7 +3485,7 @@ StringRef BuiltinType::getName(const PrintingPolicy
&Policy) const {
#define SVE_TYPE(Name, Id, SingletonId) \
case Id: \
return Name;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case Id: \
return #Name;
@@ -4856,7 +4856,7 @@ bool Type::canHaveNullability(bool ResultIfUnknown) const
{
case BuiltinType::OCLReserveID:
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/AST/TypeLoc.cpp b/clang/lib/AST/TypeLoc.cpp
index fbb7fc5cd76902..a5e81dbee7ab49 100644
--- a/clang/lib/AST/TypeLoc.cpp
+++ b/clang/lib/AST/TypeLoc.cpp
@@ -420,7 +420,7 @@ TypeSpecifierType BuiltinTypeLoc::getWrittenTypeSpec()
const {
case BuiltinType::OCLReserveID:
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 6cbcaf03844102..3dd7dac85778fa 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -777,7 +777,7 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType
*BT) {
#include "clang/Basic/HLSLIntangibleTypes.def"
#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
{
if (BT->getKind() == BuiltinType::MFloat8) {
Encoding = llvm::dwarf::DW_ATE_unsigned_char;
diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp
b/clang/lib/CodeGen/CodeGenTypes.cpp
index 09191a4901f493..f7d0fbd7b89380 100644
--- a/clang/lib/CodeGen/CodeGenTypes.cpp
+++ b/clang/lib/CodeGen/CodeGenTypes.cpp
@@ -508,7 +508,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
{
ASTContext::BuiltinVectorTypeInfo Info =
Context.getBuiltinVectorTypeInfo(cast<BuiltinType>(Ty));
diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp
b/clang/lib/CodeGen/ItaniumCXXABI.cpp
index 7c463f51f63dc5..f995b187bd270f 100644
--- a/clang/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp
@@ -3636,7 +3636,7 @@ static bool TypeInfoIsInStandardLibrary(const BuiltinType
*Ty) {
case BuiltinType::OCLReserveID:
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/CodeGen/Targets/AArch64.cpp
b/clang/lib/CodeGen/Targets/AArch64.cpp
index 7db67ecba07c8f..5322c5784b2d8b 100644
--- a/clang/lib/CodeGen/Targets/AArch64.cpp
+++ b/clang/lib/CodeGen/Targets/AArch64.cpp
@@ -768,7 +768,7 @@ bool AArch64ABIInfo::passAsPureScalableType(
isPredicate = true;
\
break;
#define SVE_TYPE(Name, Id, SingletonId)
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
default:
return false;
}
diff --git a/clang/lib/Index/USRGeneration.cpp
b/clang/lib/Index/USRGeneration.cpp
index 493123459a5a4d..189aeee024062d 100644
--- a/clang/lib/Index/USRGeneration.cpp
+++ b/clang/lib/Index/USRGeneration.cpp
@@ -766,7 +766,7 @@ void USRGenerator::VisitType(QualType T) {
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id: \
Out << "@BT@" << Name; break;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id: \
Out << "@BT@" << #Name; break;
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index abb46d3a84e74e..bda70f843c56f6 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -480,7 +480,7 @@ void Sema::Initialize() {
Context.getAuxTargetInfo()->hasAArch64SVETypes())) {
#define SVE_TYPE(Name, Id, SingletonId) \
addImplicitTypedef(Name, Context.SingletonId);
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
}
if (Context.getTargetInfo().getTriple().isPPC64()) {
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index ae40895980d90a..1e47b6c3ad2f1a 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -6146,7 +6146,7 @@ static bool isPlaceholderToRemoveAsArg(QualType type) {
// via TypedefTypes rather than exposed directly as BuiltinTypes.
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
@@ -21136,7 +21136,7 @@ ExprResult Sema::CheckPlaceholderExpr(Expr *E) {
#include "clang/Basic/OpenCLExtensionTypes.def"
#define SVE_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/clang/lib/Serialization/ASTCommon.cpp
b/clang/lib/Serialization/ASTCommon.cpp
index ec18e84255ca8e..a0b15a23a3e5e0 100644
--- a/clang/lib/Serialization/ASTCommon.cpp
+++ b/clang/lib/Serialization/ASTCommon.cpp
@@ -245,7 +245,7 @@ serialization::TypeIdxFromBuiltin(const BuiltinType *BT) {
case BuiltinType::Id: \
ID = PREDEF_TYPE_##Id##_ID; \
break;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id: \
ID = PREDEF_TYPE_##Id##_ID; \
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index a72ff766685bbe..d30bb49dcc3caf 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7689,7 +7689,7 @@ QualType ASTReader::GetType(TypeID ID) {
case PREDEF_TYPE_##Id##_ID: \
T = Context.SingletonId; \
break;
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case PREDEF_TYPE_##Id##_ID: \
T = Context.Id##Ty; \
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index e175aab4499fff..c0e2f5d7273d27 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -1640,7 +1640,7 @@ bool CursorVisitor::VisitBuiltinTypeLoc(BuiltinTypeLoc
TL) {
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
#define RVV_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
index 47051f2e68090f..ce1be5109bb201 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -5023,7 +5023,7 @@ lldb::Encoding
TypeSystemClang::GetEncoding(lldb::opaque_compiler_type_t type,
// ARM -- Scalable Vector Extension
#define SVE_TYPE(Name, Id, SingletonId) case clang::BuiltinType::Id:
-#include "clang/Basic/AArch64SVEACLETypes.def"
+#include "clang/Basic/AArch64Types.def"
break;
// RISC-V V builtin types.
>From ecb7076803e11f30cf47eb03e3e40ddb5b34feb7 Mon Sep 17 00:00:00 2001
From: Tomas Matheson <tomas.mathe...@arm.com>
Date: Wed, 22 Jan 2025 12:03:22 +0000
Subject: [PATCH 2/4] [NFC] rename macros in AArch64Types.def
SVE_TYPE --> AARCH64_TYPE
AARCH64_VECTOR_TYPE --> -AARCH64_VECTOR_TYPE
AARCH64_VECTOR_TYPE_MFLOAT --> -AARCH64_VECTOR_TYPE_MFLOAT
---
clang/include/clang/AST/ASTContext.h | 2 +-
clang/include/clang/AST/Type.h | 2 +-
clang/include/clang/AST/TypeProperties.td | 2 +-
clang/include/clang/Basic/AArch64Types.def | 32 +++++++++----------
.../include/clang/Serialization/ASTBitCodes.h | 2 +-
clang/lib/AST/ASTContext.cpp | 12 +++----
clang/lib/AST/ASTImporter.cpp | 2 +-
clang/lib/AST/ExprConstant.cpp | 2 +-
clang/lib/AST/ItaniumMangle.cpp | 2 +-
clang/lib/AST/MicrosoftMangle.cpp | 2 +-
clang/lib/AST/NSAPI.cpp | 2 +-
clang/lib/AST/PrintfFormatString.cpp | 2 +-
clang/lib/AST/Type.cpp | 6 ++--
clang/lib/AST/TypeLoc.cpp | 2 +-
clang/lib/CodeGen/CGDebugInfo.cpp | 2 +-
clang/lib/CodeGen/CodeGenTypes.cpp | 2 +-
clang/lib/CodeGen/ItaniumCXXABI.cpp | 2 +-
clang/lib/CodeGen/Targets/AArch64.cpp | 2 +-
clang/lib/Index/USRGeneration.cpp | 2 +-
clang/lib/Sema/Sema.cpp | 2 +-
clang/lib/Sema/SemaExpr.cpp | 4 +--
clang/lib/Serialization/ASTCommon.cpp | 2 +-
clang/lib/Serialization/ASTReader.cpp | 2 +-
clang/tools/libclang/CIndex.cpp | 2 +-
.../TypeSystem/Clang/TypeSystemClang.cpp | 2 +-
25 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/clang/include/clang/AST/ASTContext.h
b/clang/include/clang/AST/ASTContext.h
index d7066e341cfe05..32fc7790bdf422 100644
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -1202,7 +1202,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
CanQualType Id##Ty;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
CanQualType SingletonId;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h
index 983b710df7161c..9e853c11c97c6a 100644
--- a/clang/include/clang/AST/Type.h
+++ b/clang/include/clang/AST/Type.h
@@ -3041,7 +3041,7 @@ class BuiltinType : public Type {
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) Id,
#include "clang/Basic/OpenCLExtensionTypes.def"
// SVE Types
-#define SVE_TYPE(Name, Id, SingletonId) Id,
+#define AARCH64_TYPE(Name, Id, SingletonId) Id,
#include "clang/Basic/AArch64Types.def"
// PPC MMA Types
#define PPC_VECTOR_TYPE(Name, Id, Size) Id,
diff --git a/clang/include/clang/AST/TypeProperties.td
b/clang/include/clang/AST/TypeProperties.td
index f6521ca3a32cd6..6fe8635ea79962 100644
--- a/clang/include/clang/AST/TypeProperties.td
+++ b/clang/include/clang/AST/TypeProperties.td
@@ -884,7 +884,7 @@ let Class = BuiltinType in {
case BuiltinType::ID: return ctx.ID##Ty;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define SVE_TYPE(NAME, ID, SINGLETON_ID) \
+#define AARCH64_TYPE(NAME, ID, SINGLETON_ID) \
case BuiltinType::ID: return ctx.SINGLETON_ID;
#include "clang/Basic/AArch64Types.def"
diff --git a/clang/include/clang/Basic/AArch64Types.def
b/clang/include/clang/Basic/AArch64Types.def
index 063cac1f4a58ee..73f8887d728c4a 100644
--- a/clang/include/clang/Basic/AArch64Types.def
+++ b/clang/include/clang/Basic/AArch64Types.def
@@ -8,7 +8,7 @@
//
// This file defines various SVE builtin types. The macros are:
//
-// SVE_TYPE:
+// AARCH64_TYPE:
// - (Name, MangledName, Id, SingletonId)
// A builtin type that has not been covered by any other #define. Defining
// this macro covers all the builtin types.
@@ -59,7 +59,7 @@
#ifndef SVE_VECTOR_TYPE
#define SVE_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
- SVE_TYPE(Name, Id, SingletonId)
+ AARCH64_TYPE(Name, Id, SingletonId)
#endif
#ifndef SVE_VECTOR_TYPE_DETAILS
@@ -84,7 +84,7 @@
#ifndef SVE_PREDICATE_TYPE
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId) \
- SVE_TYPE(Name, Id, SingletonId)
+ AARCH64_TYPE(Name, Id, SingletonId)
#endif
#ifndef SVE_PREDICATE_TYPE_ALL
@@ -94,17 +94,17 @@
#ifndef SVE_OPAQUE_TYPE
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId) \
- SVE_TYPE(Name, Id, SingletonId)
+ AARCH64_TYPE(Name, Id, SingletonId)
#endif
-#ifndef AARCH64_VECTOR_TYPE
-#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
- SVE_TYPE(Name, Id, SingletonId)
+#ifndef NEON_VECTOR_TYPE
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
+ AARCH64_TYPE(Name, Id, SingletonId)
#endif
-#ifndef AARCH64_VECTOR_TYPE_MFLOAT
-#define AARCH64_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls,
ElBits, NF) \
- AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
+#ifndef NEON_VECTOR_TYPE_MFLOAT
+#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls,
ElBits, NF) \
+ NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
#endif
//===- Vector point types -----------------------------------------------===//
@@ -200,9 +200,9 @@ SVE_PREDICATE_TYPE_ALL("__clang_svboolx4_t", "svboolx4_t",
SveBoolx4, SveBoolx4T
SVE_OPAQUE_TYPE("__SVCount_t", "__SVCount_t", SveCount, SveCountTy)
-AARCH64_VECTOR_TYPE_MFLOAT("__mfp8", "__mfp8", MFloat8, MFloat8Ty, 1, 8, 1)
-AARCH64_VECTOR_TYPE_MFLOAT("__MFloat8x8_t", "__MFloat8x8_t", MFloat8x8,
MFloat8x8Ty, 8, 8, 1)
-AARCH64_VECTOR_TYPE_MFLOAT("__MFloat8x16_t", "__MFloat8x16_t", MFloat8x16,
MFloat8x16Ty, 16, 8, 1)
+NEON_VECTOR_TYPE_MFLOAT("__mfp8", "__mfp8", MFloat8, MFloat8Ty, 1, 8, 1)
+NEON_VECTOR_TYPE_MFLOAT("__MFloat8x8_t", "__MFloat8x8_t", MFloat8x8,
MFloat8x8Ty, 8, 8, 1)
+NEON_VECTOR_TYPE_MFLOAT("__MFloat8x16_t", "__MFloat8x16_t", MFloat8x16,
MFloat8x16Ty, 16, 8, 1)
#undef SVE_VECTOR_TYPE
#undef SVE_VECTOR_TYPE_BFLOAT
@@ -211,6 +211,6 @@ AARCH64_VECTOR_TYPE_MFLOAT("__MFloat8x16_t",
"__MFloat8x16_t", MFloat8x16, MFloa
#undef SVE_PREDICATE_TYPE
#undef SVE_PREDICATE_TYPE_ALL
#undef SVE_OPAQUE_TYPE
-#undef AARCH64_VECTOR_TYPE_MFLOAT
-#undef AARCH64_VECTOR_TYPE
-#undef SVE_TYPE
+#undef NEON_VECTOR_TYPE_MFLOAT
+#undef NEON_VECTOR_TYPE
+#undef AARCH64_TYPE
diff --git a/clang/include/clang/Serialization/ASTBitCodes.h
b/clang/include/clang/Serialization/ASTBitCodes.h
index 05d1cf1fd5cdb6..0e7df9606ccdec 100644
--- a/clang/include/clang/Serialization/ASTBitCodes.h
+++ b/clang/include/clang/Serialization/ASTBitCodes.h
@@ -1128,7 +1128,7 @@ enum PredefinedTypeIDs {
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) PREDEF_TYPE_##Id##_ID,
#include "clang/Basic/OpenCLExtensionTypes.def"
// \brief SVE types with auto numeration
-#define SVE_TYPE(Name, Id, SingletonId) PREDEF_TYPE_##Id##_ID,
+#define AARCH64_TYPE(Name, Id, SingletonId) PREDEF_TYPE_##Id##_ID,
#include "clang/Basic/AArch64Types.def"
// \brief PowerPC MMA types with auto numeration
#define PPC_VECTOR_TYPE(Name, Id, Size) PREDEF_TYPE_##Id##_ID,
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index c19b50cf15b5f7..7b0f3514320f9d 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -1440,7 +1440,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo
&Target,
if (Target.hasAArch64SVETypes() ||
(AuxTarget && AuxTarget->hasAArch64SVETypes())) {
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
InitBuiltinType(SingletonId, BuiltinType::Id);
#include "clang/Basic/AArch64Types.def"
}
@@ -2269,7 +2269,7 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const
{
Width = 0;
\
Align = 16;
\
break;
-#define AARCH64_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls,
\
+#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
ElBits, NF)
\
case BuiltinType::Id:
\
Width = NumEls * ElBits * NF;
\
@@ -3424,7 +3424,7 @@ static void encodeTypeForFunctionPointerAuth(const
ASTContext &Ctx,
case BuiltinType::Id:
\
return;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId)
\
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
case BuiltinType::Id:
\
return;
#include "clang/Basic/AArch64Types.def"
@@ -4398,7 +4398,7 @@ ASTContext::getBuiltinVectorTypeInfo(const BuiltinType
*Ty) const {
#define SVE_PREDICATE_TYPE_ALL(Name, MangledName, Id, SingletonId, NumEls, NF)
\
case BuiltinType::Id:
\
return {BoolTy, llvm::ElementCount::getScalable(NumEls), NF};
-#define AARCH64_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls,
\
+#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
ElBits, NF)
\
case BuiltinType::Id:
\
return {getIntTypeForBitwidth(ElBits, false),
\
@@ -4469,7 +4469,7 @@ QualType ASTContext::getScalableVectorType(QualType
EltTy, unsigned NumElts,
if (EltTy->isBooleanType() && NumElts == (NumEls * NF) && NumFields == 1)
\
return SingletonId;
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
-#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
#include "clang/Basic/AArch64Types.def"
} else if (Target->hasRISCVVTypes()) {
uint64_t EltTySize = getTypeSize(EltTy);
@@ -8777,7 +8777,7 @@ static char getObjCEncodingForPrimitiveType(const
ASTContext *C,
// FIXME: potentially need @encodes for these!
return ' ';
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define RVV_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index 747b2599137a03..5750b6ce126c20 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -1120,7 +1120,7 @@ ExpectedType ASTNodeImporter::VisitBuiltinType(const
BuiltinType *T) {
case BuiltinType::Id: \
return Importer.getToContext().Id##Ty;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id: \
return Importer.getToContext().SingletonId;
#include "clang/Basic/AArch64Types.def"
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index d0ed3debfecced..0daa35822fc562 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -12203,7 +12203,7 @@ GCCTypeClass EvaluateBuiltinClassifyType(QualType T,
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp
index 459b02201ac095..7b0b92d474f14d 100644
--- a/clang/lib/AST/ItaniumMangle.cpp
+++ b/clang/lib/AST/ItaniumMangle.cpp
@@ -3433,7 +3433,7 @@ void CXXNameMangler::mangleType(const BuiltinType *T) {
type_name = MangledName;
\
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
break;
-#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
case BuiltinType::Id:
\
type_name = MangledName;
\
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
diff --git a/clang/lib/AST/MicrosoftMangle.cpp
b/clang/lib/AST/MicrosoftMangle.cpp
index b6412d48dbb072..0a0207df5f0227 100644
--- a/clang/lib/AST/MicrosoftMangle.cpp
+++ b/clang/lib/AST/MicrosoftMangle.cpp
@@ -2806,7 +2806,7 @@ void MicrosoftCXXNameMangler::mangleType(const
BuiltinType *T, Qualifiers,
break;
#include "clang/Basic/HLSLIntangibleTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/AST/NSAPI.cpp b/clang/lib/AST/NSAPI.cpp
index f24981ec0758b8..aafbc7c6f24ce3 100644
--- a/clang/lib/AST/NSAPI.cpp
+++ b/clang/lib/AST/NSAPI.cpp
@@ -443,7 +443,7 @@ NSAPI::getNSNumberFactoryMethodKind(QualType T) const {
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/AST/PrintfFormatString.cpp
b/clang/lib/AST/PrintfFormatString.cpp
index 8cbabdb31527d9..dd8073ac3589a0 100644
--- a/clang/lib/AST/PrintfFormatString.cpp
+++ b/clang/lib/AST/PrintfFormatString.cpp
@@ -855,7 +855,7 @@ bool PrintfSpecifier::fixType(QualType QT, const
LangOptions &LangOpt,
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
case BuiltinType::Id:
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index 69446b01343295..b7457cc5d7a894 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -2527,7 +2527,7 @@ bool Type::isSVESizelessBuiltinType() const {
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
return true;
-#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
case BuiltinType::Id:
\
return false;
#include "clang/Basic/AArch64Types.def"
@@ -3482,7 +3482,7 @@ StringRef BuiltinType::getName(const PrintingPolicy
&Policy) const {
case Id: \
return #ExtType;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case Id: \
return Name;
#include "clang/Basic/AArch64Types.def"
@@ -4854,7 +4854,7 @@ bool Type::canHaveNullability(bool ResultIfUnknown) const
{
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/AST/TypeLoc.cpp b/clang/lib/AST/TypeLoc.cpp
index a5e81dbee7ab49..74c83a17867607 100644
--- a/clang/lib/AST/TypeLoc.cpp
+++ b/clang/lib/AST/TypeLoc.cpp
@@ -418,7 +418,7 @@ TypeSpecifierType BuiltinTypeLoc::getWrittenTypeSpec()
const {
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 3dd7dac85778fa..be68b96f8bbc61 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -776,7 +776,7 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType
*BT) {
return getOrCreateStructPtrType(#Name, SingletonId);
#include "clang/Basic/HLSLIntangibleTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
{
if (BT->getKind() == BuiltinType::MFloat8) {
diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp
b/clang/lib/CodeGen/CodeGenTypes.cpp
index f7d0fbd7b89380..ee67322b7211e8 100644
--- a/clang/lib/CodeGen/CodeGenTypes.cpp
+++ b/clang/lib/CodeGen/CodeGenTypes.cpp
@@ -505,7 +505,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
case BuiltinType::Id:
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
-#define AARCH64_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
case BuiltinType::Id:
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
#include "clang/Basic/AArch64Types.def"
diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp
b/clang/lib/CodeGen/ItaniumCXXABI.cpp
index f995b187bd270f..7026fd67f4c1d8 100644
--- a/clang/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp
@@ -3634,7 +3634,7 @@ static bool TypeInfoIsInStandardLibrary(const BuiltinType
*Ty) {
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/CodeGen/Targets/AArch64.cpp
b/clang/lib/CodeGen/Targets/AArch64.cpp
index 5322c5784b2d8b..6b2bd01a4b0a45 100644
--- a/clang/lib/CodeGen/Targets/AArch64.cpp
+++ b/clang/lib/CodeGen/Targets/AArch64.cpp
@@ -767,7 +767,7 @@ bool AArch64ABIInfo::passAsPureScalableType(
case BuiltinType::Id:
\
isPredicate = true;
\
break;
-#define SVE_TYPE(Name, Id, SingletonId)
+#define AARCH64_TYPE(Name, Id, SingletonId)
#include "clang/Basic/AArch64Types.def"
default:
return false;
diff --git a/clang/lib/Index/USRGeneration.cpp
b/clang/lib/Index/USRGeneration.cpp
index 189aeee024062d..d84f8fabbe51dc 100644
--- a/clang/lib/Index/USRGeneration.cpp
+++ b/clang/lib/Index/USRGeneration.cpp
@@ -763,7 +763,7 @@ void USRGenerator::VisitType(QualType T) {
Out << "@BT@OCLReserveID"; break;
case BuiltinType::OCLSampler:
Out << "@BT@OCLSampler"; break;
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id: \
Out << "@BT@" << Name; break;
#include "clang/Basic/AArch64Types.def"
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index bda70f843c56f6..25306041f6fbac 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -478,7 +478,7 @@ void Sema::Initialize() {
if (Context.getTargetInfo().hasAArch64SVETypes() ||
(Context.getAuxTargetInfo() &&
Context.getAuxTargetInfo()->hasAArch64SVETypes())) {
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
addImplicitTypedef(Name, Context.SingletonId);
#include "clang/Basic/AArch64Types.def"
}
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 1e47b6c3ad2f1a..f1088da60f6717 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -6144,7 +6144,7 @@ static bool isPlaceholderToRemoveAsArg(QualType type) {
#include "clang/Basic/OpenCLExtensionTypes.def"
// In practice we'll never use this, since all SVE types are sugared
// via TypedefTypes rather than exposed directly as BuiltinTypes.
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
@@ -21134,7 +21134,7 @@ ExprResult Sema::CheckPlaceholderExpr(Expr *E) {
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
case BuiltinType::Id:
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/Serialization/ASTCommon.cpp
b/clang/lib/Serialization/ASTCommon.cpp
index a0b15a23a3e5e0..c384c7633439b6 100644
--- a/clang/lib/Serialization/ASTCommon.cpp
+++ b/clang/lib/Serialization/ASTCommon.cpp
@@ -241,7 +241,7 @@ serialization::TypeIdxFromBuiltin(const BuiltinType *BT) {
case BuiltinType::OCLReserveID:
ID = PREDEF_TYPE_RESERVE_ID_ID;
break;
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case BuiltinType::Id: \
ID = PREDEF_TYPE_##Id##_ID; \
break;
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index d30bb49dcc3caf..28b34124a302b5 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7685,7 +7685,7 @@ QualType ASTReader::GetType(TypeID ID) {
case PREDEF_TYPE_OMP_ITERATOR:
T = Context.OMPIteratorTy;
break;
-#define SVE_TYPE(Name, Id, SingletonId) \
+#define AARCH64_TYPE(Name, Id, SingletonId) \
case PREDEF_TYPE_##Id##_ID: \
T = Context.SingletonId; \
break;
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp
index c0e2f5d7273d27..4fcb3111d9cc1d 100644
--- a/clang/tools/libclang/CIndex.cpp
+++ b/clang/tools/libclang/CIndex.cpp
@@ -1639,7 +1639,7 @@ bool CursorVisitor::VisitBuiltinTypeLoc(BuiltinTypeLoc
TL) {
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define SVE_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) case BuiltinType::Id:
#include "clang/Basic/PPCTypes.def"
diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
index ce1be5109bb201..65a5dfc013fc04 100644
--- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
+++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
@@ -5022,7 +5022,7 @@ lldb::Encoding
TypeSystemClang::GetEncoding(lldb::opaque_compiler_type_t type,
break;
// ARM -- Scalable Vector Extension
-#define SVE_TYPE(Name, Id, SingletonId) case clang::BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case clang::BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
break;
>From 6826018562d0a21ee112bc8a46640838fd932365 Mon Sep 17 00:00:00 2001
From: Tomas Matheson <tomas.mathe...@arm.com>
Date: Wed, 22 Jan 2025 12:05:47 +0000
Subject: [PATCH 3/4] clang-format
---
clang/include/clang/AST/ASTContext.h | 3 +--
clang/lib/AST/ASTContext.cpp | 17 ++++++++---------
clang/lib/AST/ASTImporter.cpp | 4 ++--
clang/lib/AST/ExprConstant.cpp | 3 +--
clang/lib/AST/ItaniumMangle.cpp | 2 +-
clang/lib/AST/MicrosoftMangle.cpp | 3 +--
clang/lib/AST/NSAPI.cpp | 3 +--
clang/lib/AST/PrintfFormatString.cpp | 3 +--
clang/lib/AST/Type.cpp | 9 ++++-----
clang/lib/AST/TypeLoc.cpp | 3 +--
clang/lib/CodeGen/CodeGenTypes.cpp | 2 +-
clang/lib/CodeGen/ItaniumCXXABI.cpp | 3 +--
clang/lib/Index/USRGeneration.cpp | 7 ++++---
clang/lib/Sema/Sema.cpp | 4 ++--
clang/lib/Sema/SemaExpr.cpp | 6 ++----
clang/lib/Serialization/ASTCommon.cpp | 6 +++---
clang/lib/Serialization/ASTReader.cpp | 8 ++++----
17 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/clang/include/clang/AST/ASTContext.h
b/clang/include/clang/AST/ASTContext.h
index 32fc7790bdf422..4583b2cc2fa1af 100644
--- a/clang/include/clang/AST/ASTContext.h
+++ b/clang/include/clang/AST/ASTContext.h
@@ -1202,8 +1202,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
CanQualType Id##Ty;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- CanQualType SingletonId;
+#define AARCH64_TYPE(Name, Id, SingletonId) CanQualType SingletonId;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
CanQualType Id##Ty;
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 7b0f3514320f9d..4956f1144cd88b 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -1440,8 +1440,8 @@ void ASTContext::InitBuiltinTypes(const TargetInfo
&Target,
if (Target.hasAArch64SVETypes() ||
(AuxTarget && AuxTarget->hasAArch64SVETypes())) {
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- InitBuiltinType(SingletonId, BuiltinType::Id);
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
+ InitBuiltinType(SingletonId, BuiltinType::Id);
#include "clang/Basic/AArch64Types.def"
}
@@ -2269,8 +2269,8 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const
{
Width = 0;
\
Align = 16;
\
break;
-#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
- ElBits, NF)
\
+#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls,
\
+ ElBits, NF)
\
case BuiltinType::Id:
\
Width = NumEls * ElBits * NF;
\
Align = NumEls * ElBits;
\
@@ -3424,7 +3424,7 @@ static void encodeTypeForFunctionPointerAuth(const
ASTContext &Ctx,
case BuiltinType::Id:
\
return;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define AARCH64_TYPE(Name, Id, SingletonId)
\
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
case BuiltinType::Id:
\
return;
#include "clang/Basic/AArch64Types.def"
@@ -4398,8 +4398,8 @@ ASTContext::getBuiltinVectorTypeInfo(const BuiltinType
*Ty) const {
#define SVE_PREDICATE_TYPE_ALL(Name, MangledName, Id, SingletonId, NumEls, NF)
\
case BuiltinType::Id:
\
return {BoolTy, llvm::ElementCount::getScalable(NumEls), NF};
-#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls, \
- ElBits, NF)
\
+#define NEON_VECTOR_TYPE_MFLOAT(Name, MangledName, Id, SingletonId, NumEls,
\
+ ElBits, NF)
\
case BuiltinType::Id:
\
return {getIntTypeForBitwidth(ElBits, false),
\
llvm::ElementCount::getFixed(NumEls), NF};
@@ -8777,8 +8777,7 @@ static char getObjCEncodingForPrimitiveType(const
ASTContext *C,
// FIXME: potentially need @encodes for these!
return ' ';
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define RVV_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/RISCVVTypes.def"
diff --git a/clang/lib/AST/ASTImporter.cpp b/clang/lib/AST/ASTImporter.cpp
index 5750b6ce126c20..95e5e18019ca72 100644
--- a/clang/lib/AST/ASTImporter.cpp
+++ b/clang/lib/AST/ASTImporter.cpp
@@ -1120,8 +1120,8 @@ ExpectedType ASTNodeImporter::VisitBuiltinType(const
BuiltinType *T) {
case BuiltinType::Id: \
return Importer.getToContext().Id##Ty;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id: \
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
+ case BuiltinType::Id:
\
return Importer.getToContext().SingletonId;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 0daa35822fc562..643c68552ae03d 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -12203,8 +12203,7 @@ GCCTypeClass EvaluateBuiltinClassifyType(QualType T,
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp
index 7b0b92d474f14d..a47492d1a36729 100644
--- a/clang/lib/AST/ItaniumMangle.cpp
+++ b/clang/lib/AST/ItaniumMangle.cpp
@@ -3433,7 +3433,7 @@ void CXXNameMangler::mangleType(const BuiltinType *T) {
type_name = MangledName;
\
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
break;
-#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
type_name = MangledName;
\
Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
diff --git a/clang/lib/AST/MicrosoftMangle.cpp
b/clang/lib/AST/MicrosoftMangle.cpp
index 0a0207df5f0227..90ec2cf226c84e 100644
--- a/clang/lib/AST/MicrosoftMangle.cpp
+++ b/clang/lib/AST/MicrosoftMangle.cpp
@@ -2806,8 +2806,7 @@ void MicrosoftCXXNameMangler::mangleType(const
BuiltinType *T, Qualifiers,
break;
#include "clang/Basic/HLSLIntangibleTypes.def"
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/AST/NSAPI.cpp b/clang/lib/AST/NSAPI.cpp
index aafbc7c6f24ce3..7146b9392c5bc9 100644
--- a/clang/lib/AST/NSAPI.cpp
+++ b/clang/lib/AST/NSAPI.cpp
@@ -443,8 +443,7 @@ NSAPI::getNSNumberFactoryMethodKind(QualType T) const {
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/AST/PrintfFormatString.cpp
b/clang/lib/AST/PrintfFormatString.cpp
index dd8073ac3589a0..8f55f5a89f7e7e 100644
--- a/clang/lib/AST/PrintfFormatString.cpp
+++ b/clang/lib/AST/PrintfFormatString.cpp
@@ -855,8 +855,7 @@ bool PrintfSpecifier::fixType(QualType QT, const
LangOptions &LangOpt,
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
case BuiltinType::Id:
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index b7457cc5d7a894..f435dddb910481 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -2527,7 +2527,7 @@ bool Type::isSVESizelessBuiltinType() const {
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
return true;
-#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
return false;
#include "clang/Basic/AArch64Types.def"
@@ -3482,8 +3482,8 @@ StringRef BuiltinType::getName(const PrintingPolicy
&Policy) const {
case Id: \
return #ExtType;
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case Id: \
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
+ case Id:
\
return Name;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
@@ -4854,8 +4854,7 @@ bool Type::canHaveNullability(bool ResultIfUnknown) const
{
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/AST/TypeLoc.cpp b/clang/lib/AST/TypeLoc.cpp
index 74c83a17867607..4dec385b26de30 100644
--- a/clang/lib/AST/TypeLoc.cpp
+++ b/clang/lib/AST/TypeLoc.cpp
@@ -418,8 +418,7 @@ TypeSpecifierType BuiltinTypeLoc::getWrittenTypeSpec()
const {
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp
b/clang/lib/CodeGen/CodeGenTypes.cpp
index ee67322b7211e8..07f1400c631cd9 100644
--- a/clang/lib/CodeGen/CodeGenTypes.cpp
+++ b/clang/lib/CodeGen/CodeGenTypes.cpp
@@ -505,7 +505,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
case BuiltinType::Id:
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
-#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId) \
+#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
#include "clang/Basic/AArch64Types.def"
diff --git a/clang/lib/CodeGen/ItaniumCXXABI.cpp
b/clang/lib/CodeGen/ItaniumCXXABI.cpp
index 7026fd67f4c1d8..8a81b746d5071a 100644
--- a/clang/lib/CodeGen/ItaniumCXXABI.cpp
+++ b/clang/lib/CodeGen/ItaniumCXXABI.cpp
@@ -3634,8 +3634,7 @@ static bool TypeInfoIsInStandardLibrary(const BuiltinType
*Ty) {
case BuiltinType::OCLClkEvent:
case BuiltinType::OCLQueue:
case BuiltinType::OCLReserveID:
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/Index/USRGeneration.cpp
b/clang/lib/Index/USRGeneration.cpp
index d84f8fabbe51dc..557cce44ed8bab 100644
--- a/clang/lib/Index/USRGeneration.cpp
+++ b/clang/lib/Index/USRGeneration.cpp
@@ -763,9 +763,10 @@ void USRGenerator::VisitType(QualType T) {
Out << "@BT@OCLReserveID"; break;
case BuiltinType::OCLSampler:
Out << "@BT@OCLSampler"; break;
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id: \
- Out << "@BT@" << Name; break;
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
+ case BuiltinType::Id:
\
+ Out << "@BT@" << Name;
\
+ break;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id: \
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 25306041f6fbac..84f491ab7c7961 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -478,8 +478,8 @@ void Sema::Initialize() {
if (Context.getTargetInfo().hasAArch64SVETypes() ||
(Context.getAuxTargetInfo() &&
Context.getAuxTargetInfo()->hasAArch64SVETypes())) {
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- addImplicitTypedef(Name, Context.SingletonId);
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
+ addImplicitTypedef(Name, Context.SingletonId);
#include "clang/Basic/AArch64Types.def"
}
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index f1088da60f6717..c0342055ed6b87 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -6144,8 +6144,7 @@ static bool isPlaceholderToRemoveAsArg(QualType type) {
#include "clang/Basic/OpenCLExtensionTypes.def"
// In practice we'll never use this, since all SVE types are sugared
// via TypedefTypes rather than exposed directly as BuiltinTypes.
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
@@ -21134,8 +21133,7 @@ ExprResult Sema::CheckPlaceholderExpr(Expr *E) {
#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \
case BuiltinType::Id:
#include "clang/Basic/OpenCLExtensionTypes.def"
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id:
+#define AARCH64_TYPE(Name, Id, SingletonId) case BuiltinType::Id:
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case BuiltinType::Id:
diff --git a/clang/lib/Serialization/ASTCommon.cpp
b/clang/lib/Serialization/ASTCommon.cpp
index c384c7633439b6..e82dfff6f3f9dd 100644
--- a/clang/lib/Serialization/ASTCommon.cpp
+++ b/clang/lib/Serialization/ASTCommon.cpp
@@ -241,9 +241,9 @@ serialization::TypeIdxFromBuiltin(const BuiltinType *BT) {
case BuiltinType::OCLReserveID:
ID = PREDEF_TYPE_RESERVE_ID_ID;
break;
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case BuiltinType::Id: \
- ID = PREDEF_TYPE_##Id##_ID; \
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
+ case BuiltinType::Id:
\
+ ID = PREDEF_TYPE_##Id##_ID;
\
break;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/Serialization/ASTReader.cpp
b/clang/lib/Serialization/ASTReader.cpp
index 28b34124a302b5..8c3bf14c9508e5 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -7685,10 +7685,10 @@ QualType ASTReader::GetType(TypeID ID) {
case PREDEF_TYPE_OMP_ITERATOR:
T = Context.OMPIteratorTy;
break;
-#define AARCH64_TYPE(Name, Id, SingletonId) \
- case PREDEF_TYPE_##Id##_ID: \
- T = Context.SingletonId; \
- break;
+#define AARCH64_TYPE(Name, Id, SingletonId)
\
+ case PREDEF_TYPE_##Id##_ID:
\
+ T = Context.SingletonId;
\
+ break;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case PREDEF_TYPE_##Id##_ID: \
>From 9833b844482b3b0cc568e10a07024598a01452f8 Mon Sep 17 00:00:00 2001
From: Tomas Matheson <tomas.mathe...@arm.com>
Date: Thu, 30 Jan 2025 14:38:25 +0000
Subject: [PATCH 4/4] [NFC] remove string literals from AArch64Types.def
---
clang/include/clang/Basic/AArch64Types.def | 118 ++++++++++-----------
clang/lib/AST/ItaniumMangle.cpp | 16 +--
clang/lib/AST/Type.cpp | 2 +-
clang/lib/Index/USRGeneration.cpp | 2 +-
clang/lib/Sema/Sema.cpp | 2 +-
5 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/clang/include/clang/Basic/AArch64Types.def
b/clang/include/clang/Basic/AArch64Types.def
index 73f8887d728c4a..c7e2384f62cc35 100644
--- a/clang/include/clang/Basic/AArch64Types.def
+++ b/clang/include/clang/Basic/AArch64Types.def
@@ -109,100 +109,100 @@
//===- Vector point types -----------------------------------------------===//
-SVE_VECTOR_TYPE_INT("__SVInt8_t", "__SVInt8_t", SveInt8, SveInt8Ty, 16, 8,
1, true)
-SVE_VECTOR_TYPE_INT("__SVInt16_t", "__SVInt16_t", SveInt16, SveInt16Ty, 8, 16,
1, true)
-SVE_VECTOR_TYPE_INT("__SVInt32_t", "__SVInt32_t", SveInt32, SveInt32Ty, 4, 32,
1, true)
-SVE_VECTOR_TYPE_INT("__SVInt64_t", "__SVInt64_t", SveInt64, SveInt64Ty, 2, 64,
1, true)
+SVE_VECTOR_TYPE_INT(__SVInt8_t, __SVInt8_t, SveInt8, SveInt8Ty, 16, 8, 1,
true)
+SVE_VECTOR_TYPE_INT(__SVInt16_t, __SVInt16_t, SveInt16, SveInt16Ty, 8, 16, 1,
true)
+SVE_VECTOR_TYPE_INT(__SVInt32_t, __SVInt32_t, SveInt32, SveInt32Ty, 4, 32, 1,
true)
+SVE_VECTOR_TYPE_INT(__SVInt64_t, __SVInt64_t, SveInt64, SveInt64Ty, 2, 64, 1,
true)
-SVE_VECTOR_TYPE_INT("__SVUint8_t", "__SVUint8_t", SveUint8, SveUint8Ty, 16,
8, 1, false)
-SVE_VECTOR_TYPE_INT("__SVUint16_t", "__SVUint16_t", SveUint16, SveUint16Ty, 8,
16, 1, false)
-SVE_VECTOR_TYPE_INT("__SVUint32_t", "__SVUint32_t", SveUint32, SveUint32Ty, 4,
32, 1, false)
-SVE_VECTOR_TYPE_INT("__SVUint64_t", "__SVUint64_t", SveUint64, SveUint64Ty, 2,
64, 1, false)
+SVE_VECTOR_TYPE_INT(__SVUint8_t, __SVUint8_t, SveUint8, SveUint8Ty, 16, 8,
1, false)
+SVE_VECTOR_TYPE_INT(__SVUint16_t, __SVUint16_t, SveUint16, SveUint16Ty, 8, 16,
1, false)
+SVE_VECTOR_TYPE_INT(__SVUint32_t, __SVUint32_t, SveUint32, SveUint32Ty, 4, 32,
1, false)
+SVE_VECTOR_TYPE_INT(__SVUint64_t, __SVUint64_t, SveUint64, SveUint64Ty, 2, 64,
1, false)
-SVE_VECTOR_TYPE_FLOAT("__SVFloat16_t", "__SVFloat16_t", SveFloat16,
SveFloat16Ty, 8, 16, 1)
-SVE_VECTOR_TYPE_FLOAT("__SVFloat32_t", "__SVFloat32_t", SveFloat32,
SveFloat32Ty, 4, 32, 1)
-SVE_VECTOR_TYPE_FLOAT("__SVFloat64_t", "__SVFloat64_t", SveFloat64,
SveFloat64Ty, 2, 64, 1)
+SVE_VECTOR_TYPE_FLOAT(__SVFloat16_t, __SVFloat16_t, SveFloat16, SveFloat16Ty,
8, 16, 1)
+SVE_VECTOR_TYPE_FLOAT(__SVFloat32_t, __SVFloat32_t, SveFloat32, SveFloat32Ty,
4, 32, 1)
+SVE_VECTOR_TYPE_FLOAT(__SVFloat64_t, __SVFloat64_t, SveFloat64, SveFloat64Ty,
2, 64, 1)
-SVE_VECTOR_TYPE_BFLOAT("__SVBfloat16_t", "__SVBfloat16_t", SveBFloat16,
SveBFloat16Ty, 8, 16, 1)
+SVE_VECTOR_TYPE_BFLOAT(__SVBfloat16_t, __SVBfloat16_t, SveBFloat16,
SveBFloat16Ty, 8, 16, 1)
// This is a 8 bits opaque type.
-SVE_VECTOR_TYPE_INT("__SVMfloat8_t", "__SVMfloat8_t", SveMFloat8,
SveMFloat8Ty, 16, 8, 1, false)
+SVE_VECTOR_TYPE_INT(__SVMfloat8_t, __SVMfloat8_t, SveMFloat8, SveMFloat8Ty,
16, 8, 1, false)
//
// x2
//
-SVE_VECTOR_TYPE_INT("__clang_svint8x2_t", "svint8x2_t", SveInt8x2,
SveInt8x2Ty, 16, 8, 2, true)
-SVE_VECTOR_TYPE_INT("__clang_svint16x2_t", "svint16x2_t", SveInt16x2,
SveInt16x2Ty, 8, 16, 2, true)
-SVE_VECTOR_TYPE_INT("__clang_svint32x2_t", "svint32x2_t", SveInt32x2,
SveInt32x2Ty, 4, 32, 2, true)
-SVE_VECTOR_TYPE_INT("__clang_svint64x2_t", "svint64x2_t", SveInt64x2,
SveInt64x2Ty, 2, 64, 2, true)
+SVE_VECTOR_TYPE_INT(__clang_svint8x2_t, svint8x2_t, SveInt8x2, SveInt8x2Ty,
16, 8, 2, true)
+SVE_VECTOR_TYPE_INT(__clang_svint16x2_t, svint16x2_t, SveInt16x2,
SveInt16x2Ty, 8, 16, 2, true)
+SVE_VECTOR_TYPE_INT(__clang_svint32x2_t, svint32x2_t, SveInt32x2,
SveInt32x2Ty, 4, 32, 2, true)
+SVE_VECTOR_TYPE_INT(__clang_svint64x2_t, svint64x2_t, SveInt64x2,
SveInt64x2Ty, 2, 64, 2, true)
-SVE_VECTOR_TYPE_INT("__clang_svuint8x2_t", "svuint8x2_t", SveUint8x2,
SveUint8x2Ty, 16 , 8, 2, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint16x2_t", "svuint16x2_t", SveUint16x2,
SveUint16x2Ty, 8, 16, 2, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint32x2_t", "svuint32x2_t", SveUint32x2,
SveUint32x2Ty, 4, 32, 2, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint64x2_t", "svuint64x2_t", SveUint64x2,
SveUint64x2Ty, 2, 64, 2, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint8x2_t, svuint8x2_t, SveUint8x2,
SveUint8x2Ty, 16 , 8, 2, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint16x2_t, svuint16x2_t, SveUint16x2,
SveUint16x2Ty, 8, 16, 2, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint32x2_t, svuint32x2_t, SveUint32x2,
SveUint32x2Ty, 4, 32, 2, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint64x2_t, svuint64x2_t, SveUint64x2,
SveUint64x2Ty, 2, 64, 2, false)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat16x2_t", "svfloat16x2_t", SveFloat16x2,
SveFloat16x2Ty, 8, 16, 2)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat32x2_t", "svfloat32x2_t", SveFloat32x2,
SveFloat32x2Ty, 4, 32, 2)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat64x2_t", "svfloat64x2_t", SveFloat64x2,
SveFloat64x2Ty, 2, 64, 2)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat16x2_t, svfloat16x2_t, SveFloat16x2,
SveFloat16x2Ty, 8, 16, 2)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat32x2_t, svfloat32x2_t, SveFloat32x2,
SveFloat32x2Ty, 4, 32, 2)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat64x2_t, svfloat64x2_t, SveFloat64x2,
SveFloat64x2Ty, 2, 64, 2)
-SVE_VECTOR_TYPE_BFLOAT("__clang_svbfloat16x2_t", "svbfloat16x2_t",
SveBFloat16x2, SveBFloat16x2Ty, 8, 16, 2)
+SVE_VECTOR_TYPE_BFLOAT(__clang_svbfloat16x2_t, svbfloat16x2_t, SveBFloat16x2,
SveBFloat16x2Ty, 8, 16, 2)
-SVE_VECTOR_TYPE_INT("__clang_svmfloat8x2_t", "svmfloat8x2_t", SveMFloat8x2,
SveMFloat8x2Ty, 16, 8, 2, false)
+SVE_VECTOR_TYPE_INT(__clang_svmfloat8x2_t, svmfloat8x2_t, SveMFloat8x2,
SveMFloat8x2Ty, 16, 8, 2, false)
//
// x3
//
-SVE_VECTOR_TYPE_INT("__clang_svint8x3_t", "svint8x3_t", SveInt8x3,
SveInt8x3Ty, 16, 8, 3, true)
-SVE_VECTOR_TYPE_INT("__clang_svint16x3_t", "svint16x3_t", SveInt16x3,
SveInt16x3Ty, 8, 16, 3, true)
-SVE_VECTOR_TYPE_INT("__clang_svint32x3_t", "svint32x3_t", SveInt32x3,
SveInt32x3Ty, 4, 32, 3, true)
-SVE_VECTOR_TYPE_INT("__clang_svint64x3_t", "svint64x3_t", SveInt64x3,
SveInt64x3Ty, 2, 64, 3, true)
+SVE_VECTOR_TYPE_INT(__clang_svint8x3_t, svint8x3_t, SveInt8x3, SveInt8x3Ty,
16, 8, 3, true)
+SVE_VECTOR_TYPE_INT(__clang_svint16x3_t, svint16x3_t, SveInt16x3,
SveInt16x3Ty, 8, 16, 3, true)
+SVE_VECTOR_TYPE_INT(__clang_svint32x3_t, svint32x3_t, SveInt32x3,
SveInt32x3Ty, 4, 32, 3, true)
+SVE_VECTOR_TYPE_INT(__clang_svint64x3_t, svint64x3_t, SveInt64x3,
SveInt64x3Ty, 2, 64, 3, true)
-SVE_VECTOR_TYPE_INT("__clang_svuint8x3_t", "svuint8x3_t", SveUint8x3,
SveUint8x3Ty, 16, 8, 3, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint16x3_t", "svuint16x3_t", SveUint16x3,
SveUint16x3Ty, 8, 16, 3, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint32x3_t", "svuint32x3_t", SveUint32x3,
SveUint32x3Ty, 4, 32, 3, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint64x3_t", "svuint64x3_t", SveUint64x3,
SveUint64x3Ty, 2, 64, 3, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint8x3_t, svuint8x3_t, SveUint8x3,
SveUint8x3Ty, 16, 8, 3, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint16x3_t, svuint16x3_t, SveUint16x3,
SveUint16x3Ty, 8, 16, 3, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint32x3_t, svuint32x3_t, SveUint32x3,
SveUint32x3Ty, 4, 32, 3, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint64x3_t, svuint64x3_t, SveUint64x3,
SveUint64x3Ty, 2, 64, 3, false)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat16x3_t", "svfloat16x3_t", SveFloat16x3,
SveFloat16x3Ty, 8, 16, 3)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat32x3_t", "svfloat32x3_t", SveFloat32x3,
SveFloat32x3Ty, 4, 32, 3)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat64x3_t", "svfloat64x3_t", SveFloat64x3,
SveFloat64x3Ty, 2, 64, 3)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat16x3_t, svfloat16x3_t, SveFloat16x3,
SveFloat16x3Ty, 8, 16, 3)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat32x3_t, svfloat32x3_t, SveFloat32x3,
SveFloat32x3Ty, 4, 32, 3)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat64x3_t, svfloat64x3_t, SveFloat64x3,
SveFloat64x3Ty, 2, 64, 3)
-SVE_VECTOR_TYPE_BFLOAT("__clang_svbfloat16x3_t", "svbfloat16x3_t",
SveBFloat16x3, SveBFloat16x3Ty, 8, 16, 3)
+SVE_VECTOR_TYPE_BFLOAT(__clang_svbfloat16x3_t, svbfloat16x3_t, SveBFloat16x3,
SveBFloat16x3Ty, 8, 16, 3)
-SVE_VECTOR_TYPE_INT("__clang_svmfloat8x3_t", "svmfloat8x3_t", SveMFloat8x3,
SveMFloat8x3Ty, 16, 8, 3, false)
+SVE_VECTOR_TYPE_INT(__clang_svmfloat8x3_t, svmfloat8x3_t, SveMFloat8x3,
SveMFloat8x3Ty, 16, 8, 3, false)
//
// x4
//
-SVE_VECTOR_TYPE_INT("__clang_svint8x4_t", "svint8x4_t", SveInt8x4,
SveInt8x4Ty, 16, 8, 4, true)
-SVE_VECTOR_TYPE_INT("__clang_svint16x4_t", "svint16x4_t", SveInt16x4,
SveInt16x4Ty, 8, 16, 4, true)
-SVE_VECTOR_TYPE_INT("__clang_svint32x4_t", "svint32x4_t", SveInt32x4,
SveInt32x4Ty, 4, 32, 4, true)
-SVE_VECTOR_TYPE_INT("__clang_svint64x4_t", "svint64x4_t", SveInt64x4,
SveInt64x4Ty, 2, 64, 4, true)
+SVE_VECTOR_TYPE_INT(__clang_svint8x4_t, svint8x4_t, SveInt8x4, SveInt8x4Ty,
16, 8, 4, true)
+SVE_VECTOR_TYPE_INT(__clang_svint16x4_t, svint16x4_t, SveInt16x4,
SveInt16x4Ty, 8, 16, 4, true)
+SVE_VECTOR_TYPE_INT(__clang_svint32x4_t, svint32x4_t, SveInt32x4,
SveInt32x4Ty, 4, 32, 4, true)
+SVE_VECTOR_TYPE_INT(__clang_svint64x4_t, svint64x4_t, SveInt64x4,
SveInt64x4Ty, 2, 64, 4, true)
-SVE_VECTOR_TYPE_INT("__clang_svuint8x4_t", "svuint8x4_t", SveUint8x4,
SveUint8x4Ty, 16, 8, 4, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint16x4_t", "svuint16x4_t", SveUint16x4,
SveUint16x4Ty, 8, 16, 4, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint32x4_t", "svuint32x4_t", SveUint32x4,
SveUint32x4Ty, 4, 32, 4, false)
-SVE_VECTOR_TYPE_INT("__clang_svuint64x4_t", "svuint64x4_t", SveUint64x4,
SveUint64x4Ty, 2, 64, 4, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint8x4_t, svuint8x4_t, SveUint8x4,
SveUint8x4Ty, 16, 8, 4, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint16x4_t, svuint16x4_t, SveUint16x4,
SveUint16x4Ty, 8, 16, 4, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint32x4_t, svuint32x4_t, SveUint32x4,
SveUint32x4Ty, 4, 32, 4, false)
+SVE_VECTOR_TYPE_INT(__clang_svuint64x4_t, svuint64x4_t, SveUint64x4,
SveUint64x4Ty, 2, 64, 4, false)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat16x4_t", "svfloat16x4_t", SveFloat16x4,
SveFloat16x4Ty, 8, 16, 4)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat32x4_t", "svfloat32x4_t", SveFloat32x4,
SveFloat32x4Ty, 4, 32, 4)
-SVE_VECTOR_TYPE_FLOAT("__clang_svfloat64x4_t", "svfloat64x4_t", SveFloat64x4,
SveFloat64x4Ty, 2, 64, 4)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat16x4_t, svfloat16x4_t, SveFloat16x4,
SveFloat16x4Ty, 8, 16, 4)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat32x4_t, svfloat32x4_t, SveFloat32x4,
SveFloat32x4Ty, 4, 32, 4)
+SVE_VECTOR_TYPE_FLOAT(__clang_svfloat64x4_t, svfloat64x4_t, SveFloat64x4,
SveFloat64x4Ty, 2, 64, 4)
-SVE_VECTOR_TYPE_BFLOAT("__clang_svbfloat16x4_t", "svbfloat16x4_t",
SveBFloat16x4, SveBFloat16x4Ty, 8, 16, 4)
+SVE_VECTOR_TYPE_BFLOAT(__clang_svbfloat16x4_t, svbfloat16x4_t, SveBFloat16x4,
SveBFloat16x4Ty, 8, 16, 4)
-SVE_VECTOR_TYPE_INT("__clang_svmfloat8x4_t", "svmfloat8x4_t", SveMFloat8x4,
SveMFloat8x4Ty, 16, 8, 4, false)
+SVE_VECTOR_TYPE_INT(__clang_svmfloat8x4_t, svmfloat8x4_t, SveMFloat8x4,
SveMFloat8x4Ty, 16, 8, 4, false)
-SVE_PREDICATE_TYPE_ALL("__SVBool_t", "__SVBool_t", SveBool, SveBoolTy, 16, 1)
-SVE_PREDICATE_TYPE_ALL("__clang_svboolx2_t", "svboolx2_t", SveBoolx2,
SveBoolx2Ty, 16, 2)
-SVE_PREDICATE_TYPE_ALL("__clang_svboolx4_t", "svboolx4_t", SveBoolx4,
SveBoolx4Ty, 16, 4)
+SVE_PREDICATE_TYPE_ALL(__SVBool_t, __SVBool_t, SveBool, SveBoolTy, 16, 1)
+SVE_PREDICATE_TYPE_ALL(__clang_svboolx2_t, svboolx2_t, SveBoolx2, SveBoolx2Ty,
16, 2)
+SVE_PREDICATE_TYPE_ALL(__clang_svboolx4_t, svboolx4_t, SveBoolx4, SveBoolx4Ty,
16, 4)
-SVE_OPAQUE_TYPE("__SVCount_t", "__SVCount_t", SveCount, SveCountTy)
+SVE_OPAQUE_TYPE(__SVCount_t, __SVCount_t, SveCount, SveCountTy)
-NEON_VECTOR_TYPE_MFLOAT("__mfp8", "__mfp8", MFloat8, MFloat8Ty, 1, 8, 1)
-NEON_VECTOR_TYPE_MFLOAT("__MFloat8x8_t", "__MFloat8x8_t", MFloat8x8,
MFloat8x8Ty, 8, 8, 1)
-NEON_VECTOR_TYPE_MFLOAT("__MFloat8x16_t", "__MFloat8x16_t", MFloat8x16,
MFloat8x16Ty, 16, 8, 1)
+NEON_VECTOR_TYPE_MFLOAT(__mfp8, __mfp8, MFloat8, MFloat8Ty, 1, 8, 1)
+NEON_VECTOR_TYPE_MFLOAT(__MFloat8x8_t, __MFloat8x8_t, MFloat8x8, MFloat8x8Ty,
8, 8, 1)
+NEON_VECTOR_TYPE_MFLOAT(__MFloat8x16_t, __MFloat8x16_t, MFloat8x16,
MFloat8x16Ty, 16, 8, 1)
#undef SVE_VECTOR_TYPE
#undef SVE_VECTOR_TYPE_BFLOAT
diff --git a/clang/lib/AST/ItaniumMangle.cpp b/clang/lib/AST/ItaniumMangle.cpp
index a47492d1a36729..cced340ba3a68d 100644
--- a/clang/lib/AST/ItaniumMangle.cpp
+++ b/clang/lib/AST/ItaniumMangle.cpp
@@ -3419,24 +3419,24 @@ void CXXNameMangler::mangleType(const BuiltinType *T) {
/* Prior to Clang 18.0 we used this incorrect mangled name */
\
mangleVendorType("__SVBFloat16_t");
\
} else {
\
- type_name = MangledName;
\
- Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
+ type_name = #MangledName;
\
+ Out << (type_name == #Name ? "u" : "") << type_name.size() << type_name;
\
}
\
break;
#define SVE_PREDICATE_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
- type_name = MangledName;
\
- Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
+ type_name = #MangledName;
\
+ Out << (type_name == #Name ? "u" : "") << type_name.size() << type_name;
\
break;
#define SVE_OPAQUE_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
- type_name = MangledName;
\
- Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
+ type_name = #MangledName;
\
+ Out << (type_name == #Name ? "u" : "") << type_name.size() << type_name;
\
break;
#define NEON_VECTOR_TYPE(Name, MangledName, Id, SingletonId)
\
case BuiltinType::Id:
\
- type_name = MangledName;
\
- Out << (type_name == Name ? "u" : "") << type_name.size() << type_name;
\
+ type_name = #MangledName;
\
+ Out << (type_name == #Name ? "u" : "") << type_name.size() << type_name;
\
break;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size)
\
diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp
index f435dddb910481..21ed3f541f835f 100644
--- a/clang/lib/AST/Type.cpp
+++ b/clang/lib/AST/Type.cpp
@@ -3484,7 +3484,7 @@ StringRef BuiltinType::getName(const PrintingPolicy
&Policy) const {
#include "clang/Basic/OpenCLExtensionTypes.def"
#define AARCH64_TYPE(Name, Id, SingletonId)
\
case Id:
\
- return Name;
+ return #Name;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
case Id: \
diff --git a/clang/lib/Index/USRGeneration.cpp
b/clang/lib/Index/USRGeneration.cpp
index 557cce44ed8bab..d181de371da61c 100644
--- a/clang/lib/Index/USRGeneration.cpp
+++ b/clang/lib/Index/USRGeneration.cpp
@@ -765,7 +765,7 @@ void USRGenerator::VisitType(QualType T) {
Out << "@BT@OCLSampler"; break;
#define AARCH64_TYPE(Name, Id, SingletonId)
\
case BuiltinType::Id:
\
- Out << "@BT@" << Name;
\
+ Out << "@BT@" << #Name;
\
break;
#include "clang/Basic/AArch64Types.def"
#define PPC_VECTOR_TYPE(Name, Id, Size) \
diff --git a/clang/lib/Sema/Sema.cpp b/clang/lib/Sema/Sema.cpp
index 84f491ab7c7961..4123bd6c16a484 100644
--- a/clang/lib/Sema/Sema.cpp
+++ b/clang/lib/Sema/Sema.cpp
@@ -479,7 +479,7 @@ void Sema::Initialize() {
(Context.getAuxTargetInfo() &&
Context.getAuxTargetInfo()->hasAArch64SVETypes())) {
#define AARCH64_TYPE(Name, Id, SingletonId)
\
- addImplicitTypedef(Name, Context.SingletonId);
+ addImplicitTypedef(#Name, Context.SingletonId);
#include "clang/Basic/AArch64Types.def"
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
