Skip to content

Commit f4172f6

Browse files
authored
[Clang][AMDGPU] Simplify builtin type definitions. NFC. (#108968)
Remove the MangledName field since these types just use the normal Name for mangling purposes.
1 parent 2242cd2 commit f4172f6

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

clang/include/clang/Basic/AMDGPUTypes.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#ifndef AMDGPU_OPAQUE_PTR_TYPE
14-
#define AMDGPU_OPAQUE_PTR_TYPE(Name, MangledName, AS, Width, Align, Id, SingletonId) \
14+
#define AMDGPU_OPAQUE_PTR_TYPE(Name, AS, Width, Align, Id, SingletonId) \
1515
AMDGPU_TYPE(Name, Id, SingletonId)
1616
#endif
1717

18-
AMDGPU_OPAQUE_PTR_TYPE("__amdgpu_buffer_rsrc_t", "__amdgpu_buffer_rsrc_t", 8, 128, 128, AMDGPUBufferRsrc, AMDGPUBufferRsrcTy)
18+
AMDGPU_OPAQUE_PTR_TYPE("__amdgpu_buffer_rsrc_t", 8, 128, 128, AMDGPUBufferRsrc, AMDGPUBufferRsrcTy)
1919

2020
#undef AMDGPU_TYPE
2121
#undef AMDGPU_OPAQUE_PTR_TYPE

clang/lib/AST/ASTContext.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,8 +2243,7 @@ TypeInfo ASTContext::getTypeInfoImpl(const Type *T) const {
22432243
Align = 8; \
22442244
break;
22452245
#include "clang/Basic/WebAssemblyReferenceTypes.def"
2246-
#define AMDGPU_OPAQUE_PTR_TYPE(NAME, MANGLEDNAME, AS, WIDTH, ALIGN, ID, \
2247-
SINGLETONID) \
2246+
#define AMDGPU_OPAQUE_PTR_TYPE(NAME, AS, WIDTH, ALIGN, ID, SINGLETONID) \
22482247
case BuiltinType::ID: \
22492248
Width = WIDTH; \
22502249
Align = ALIGN; \

clang/lib/CodeGen/CGDebugInfo.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -900,13 +900,12 @@ llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {
900900
return SingletonId; \
901901
}
902902
#include "clang/Basic/WebAssemblyReferenceTypes.def"
903-
#define AMDGPU_OPAQUE_PTR_TYPE(Name, MangledName, AS, Width, Align, Id, \
904-
SingletonId) \
903+
#define AMDGPU_OPAQUE_PTR_TYPE(Name, AS, Width, Align, Id, SingletonId) \
905904
case BuiltinType::Id: { \
906905
if (!SingletonId) \
907906
SingletonId = \
908-
DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type, \
909-
MangledName, TheCU, TheCU->getFile(), 0); \
907+
DBuilder.createForwardDecl(llvm::dwarf::DW_TAG_structure_type, Name, \
908+
TheCU, TheCU->getFile(), 0); \
910909
return SingletonId; \
911910
}
912911
#include "clang/Basic/AMDGPUTypes.def"

clang/lib/CodeGen/CodeGenTypes.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,7 @@ llvm::Type *CodeGenTypes::ConvertType(QualType T) {
558558
llvm_unreachable("Unexpected wasm reference builtin type!"); \
559559
} break;
560560
#include "clang/Basic/WebAssemblyReferenceTypes.def"
561-
#define AMDGPU_OPAQUE_PTR_TYPE(Name, MangledName, AS, Width, Align, Id, \
562-
SingletonId) \
561+
#define AMDGPU_OPAQUE_PTR_TYPE(Name, AS, Width, Align, Id, SingletonId) \
563562
case BuiltinType::Id: \
564563
return llvm::PointerType::get(getLLVMContext(), AS);
565564
#include "clang/Basic/AMDGPUTypes.def"

0 commit comments

Comments
 (0)