Address feedback

Author: slinder1

llvm/include/llvm/BinaryFormat/Dwarf.h

@@ -1018,7 +1018,7 @@ LLVM_ABI StringRef IndexString(unsigned Idx);
 LLVM_ABI StringRef FormatString(DwarfFormat Format);
 LLVM_ABI StringRef FormatString(bool IsDWARF64);
 LLVM_ABI StringRef RLEString(unsigned RLE);
-LLVM_ABI StringRef AddressSpaceString(unsigned AS, llvm::Triple TT);
+LLVM_ABI StringRef AddressSpaceString(unsigned AS, const llvm::Triple &TT);
 /// @}
 
 /// \defgroup DwarfConstantsParsing Dwarf constants parsing functions

llvm/include/llvm/Support/AMDGPUAddrSpace.h

@@ -133,6 +133,19 @@ enum : unsigned {
 };
 } // namespace DWARFAS
 
+namespace impl {
+// TODO: Move this into mapToDWARFAddrSpace when we switch to C++23
+// (see https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2022/p2647r1.html)
+static constexpr unsigned LLVMToDWARFAddrSpaceMapping[] = {
+    DWARFAS::GENERIC,     //< AMDGPUAS::FLAT_ADDRESS
+    DWARFAS::GLOBAL,      //< AMDGPUAS::GLOBAL_ADDRESS
+    DWARFAS::REGION,      //< AMDGPUAS::REGION_ADDRESS
+    DWARFAS::LOCAL,       //< AMDGPUAS::LOCAL_ADDRESS
+    DWARFAS::GLOBAL,      //< AMDGPUAS::CONSTANT_ADDRESS
+    DWARFAS::PRIVATE_LANE //< AMDGPUAS::PRIVATE_ADDRESS
+};
+} // end namespace impl
+
 /// If @p LLVMAddressSpace has a corresponding DWARF encoding,
 /// return it; otherwise return the sentinel value -1 to indicate
 /// no such mapping exists.
@@ -144,20 +157,12 @@ enum : unsigned {
 ///
 /// Note: This could return std::optional<int> but that would require
 /// an extra #include.
-inline int mapToDWARFAddrSpace(unsigned LLVMAddrSpace) {
-  static constexpr unsigned LLVMToDWARFAddrSpaceMapping[] = {
-      DWARFAS::GENERIC,     //< AMDGPUAS::FLAT_ADDRESS
-      DWARFAS::GLOBAL,      //< AMDGPUAS::GLOBAL_ADDRESS
-      DWARFAS::REGION,      //< AMDGPUAS::REGION_ADDRESS
-      DWARFAS::LOCAL,       //< AMDGPUAS::LOCAL_ADDRESS
-      DWARFAS::GLOBAL,      //< AMDGPUAS::CONSTANT_ADDRESS
-      DWARFAS::PRIVATE_LANE //< AMDGPUAS::PRIVATE_ADDRESS
-  };
-  static constexpr unsigned SizeOfLLVMToDWARFAddrSpaceMapping =
-      sizeof(LLVMToDWARFAddrSpaceMapping) /
-      sizeof(LLVMToDWARFAddrSpaceMapping[0]);
+constexpr int mapToDWARFAddrSpace(unsigned LLVMAddrSpace) {
+  constexpr unsigned SizeOfLLVMToDWARFAddrSpaceMapping =
+      sizeof(impl::LLVMToDWARFAddrSpaceMapping) /
+      sizeof(impl::LLVMToDWARFAddrSpaceMapping[0]);
   if (LLVMAddrSpace < SizeOfLLVMToDWARFAddrSpaceMapping)
-    return LLVMToDWARFAddrSpaceMapping[LLVMAddrSpace];
+    return impl::LLVMToDWARFAddrSpaceMapping[LLVMAddrSpace];
   return -1;
 }
 } // end namespace AMDGPU

llvm/lib/BinaryFormat/Dwarf.cpp

@@ -911,7 +911,7 @@ StringRef llvm::dwarf::RLEString(unsigned RLE) {
   }
 }
 
-StringRef llvm::dwarf::AddressSpaceString(unsigned AS, llvm::Triple TT) {
+StringRef llvm::dwarf::AddressSpaceString(unsigned AS, const llvm::Triple &TT) {
   switch (AS) {
 #define HANDLE_DW_ASPACE(ID, NAME)                                             \
   case DW_ASPACE_LLVM_##NAME:                                                  \

llvm/lib/DebugInfo/DWARF/DWARFExpressionPrinter.cpp

@@ -60,7 +60,7 @@ static bool printOp(const DWARFExpression::Operation *Op, raw_ostream &OS,
   if (SubOpcode) {
     StringRef SubName = SubOperationEncodingString(Op->getCode(), *SubOpcode);
     assert(!SubName.empty() && "DW_OP SubOp has no name!");
-    OS << " " << SubName;
+    OS << ' ' << SubName;
   }
 
   if ((Op->getCode() >= DW_OP_breg0 && Op->getCode() <= DW_OP_breg31) ||