https://github.com/jayfoad created
https://github.com/llvm/llvm-project/pull/108968
Remove the MangledName field since these types just use the normal Name
for mangling purposes.
>From 97fc6c239af3cadb61fe70cd07bb3b31c5da7a52 Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.f...@amd.com>
Date: Tue, 17 Sep 2024 12:57:19 +0100
Subject: [PATCH] [Clang][AMDGPU] Simplify builtin type definitions. NFC.
Remove the MangledName field since these types just use the normal Name
for mangling purposes.
---
clang/include/clang/Basic/AMDGPUTypes.def | 4 ++--
clang/lib/AST/ASTContext.cpp | 3 +--
clang/lib/CodeGen/CGDebugInfo.cpp | 7 +++----
clang/lib/CodeGen/CodeGenTypes.cpp | 3 +--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/clang/include/clang/Basic/AMDGPUTypes.def
b/clang/include/clang/Basic/AMDGPUTypes.def
index e0d7be470a3259..7454d61f5dd516 100644
--- a/clang/include/clang/Basic/AMDGPUTypes.def
+++ b/clang/include/clang/Basic/AMDGPUTypes.def
@@ -11,11 +11,11 @@
//===----------------------------------------------------------------------===//
#ifndef AMDGPU_OPAQUE_PTR_TYPE
-#define AMDGPU_OPAQUE_PTR_TYPE(Name, MangledName, AS, Width, Align, Id,
SingletonId) \
+#define AMDGPU_OPAQUE_PTR_TYPE(Name, AS, Width, Align, Id, SingletonId) \
AMDGPU_TYPE(Name, Id, SingletonId)
#endif
-AMDGPU_OPAQUE_PTR_TYPE("__amdgpu_buffer_rsrc_t", "__amdgpu_buffer_rsrc_t", 8,
128, 128, AMDGPUBufferRsrc, AMDGPUBufferRsrcTy)
+AMDGPU_OPAQUE_PTR_TYPE("__amdgpu_buffer_rsrc_t", 8, 128, 128,
AMDGPUBufferRsrc, AMDGPUBufferRsrcTy)
#undef AMDGPU_TYPE
#undef AMDGPU_OPAQUE_PTR_TYPE
diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index 7cc69ca4a8a814..67841a30a571f3 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -2243,8 +2243,7 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const
{
Align = 8;
\
break;
#include "clang/Basic/WebAssemblyReferenceTypes.def"
-#define AMDGPU_OPAQUE_PTR_TYPE(NAME, MANGLEDNAME, AS, WIDTH, ALIGN, ID,
\
- SINGLETONID)
\
+#define AMDGPU_OPAQUE_PTR_TYPE(NAME, AS, WIDTH, ALIGN, ID, SINGLETONID)
\
case BuiltinType::ID:
\
Width = WIDTH;
\
Align = ALIGN;
\
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp
b/clang/lib/CodeGen/CGDebugInfo.cpp
index 6c433cf6a85d5e..2d2c280941bd64 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -900,13 +900,12 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType
*BT) {
return SingletonId;
\
}
#include "clang/Basic/WebAssemblyReferenceTypes.def"
-#define AMDGPU_OPAQUE_PTR_TYPE(Name, MangledName, AS, Width, Align, Id,
\
- SingletonId)
\
+#define AMDGPU_OPAQUE_PTR_TYPE(Name, AS, Width, Align, Id, SingletonId)
\
case BuiltinType::Id: {
\
if (!SingletonId)
\
SingletonId =
\
- DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type,
\
- MangledName, TheCU, TheCU->getFile(), 0);
\
+ DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type, Name,
\
+ TheCU, TheCU->getFile(), 0);
\
return SingletonId;
\
}
#include "clang/Basic/AMDGPUTypes.def"
diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp
b/clang/lib/CodeGen/CodeGenTypes.cpp
index d087e714882b33..77c1b27cebf401 100644
--- a/clang/lib/CodeGen/CodeGenTypes.cpp
+++ b/clang/lib/CodeGen/CodeGenTypes.cpp
@@ -558,8 +558,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
llvm_unreachable("Unexpected wasm reference builtin type!");
\
} break;
#include "clang/Basic/WebAssemblyReferenceTypes.def"
-#define AMDGPU_OPAQUE_PTR_TYPE(Name, MangledName, AS, Width, Align, Id,
\
- SingletonId)
\
+#define AMDGPU_OPAQUE_PTR_TYPE(Name, AS, Width, Align, Id, SingletonId)
\
case BuiltinType::Id:
\
return llvm::PointerType::get(getLLVMContext(), AS);
#include "clang/Basic/AMDGPUTypes.def"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
