Skip to content

[ELFAttributeParser][NFC] Make string array arguments const #101460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 2, 2024
Merged

[ELFAttributeParser][NFC] Make string array arguments const #101460

merged 1 commit into from
Aug 2, 2024

Conversation

pfusik
Copy link
Contributor

@pfusik pfusik commented Aug 1, 2024

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Aug 1, 2024 •
edited
Loading

@llvm/pr-subscribers-backend-risc-v

@llvm/pr-subscribers-llvm-support

Author: Piotr Fusik (pfusik)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/101460.diff

4 Files Affected:

  • (modified) llvm/lib/Support/ARMAttributeParser.cpp (+54-50)
  • (modified) llvm/lib/Support/CSKYAttributeParser.cpp (+9-8)
  • (modified) llvm/lib/Support/MSP430AttributeParser.cpp (+4-4)
  • (modified) llvm/lib/Support/RISCVAttributeParser.cpp (+1-1)
diff --git a/llvm/lib/Support/ARMAttributeParser.cpp b/llvm/lib/Support/ARMAttributeParser.cpp
index 3c89d160da419..b46ed2435e042 100644
--- a/llvm/lib/Support/ARMAttributeParser.cpp
+++ b/llvm/lib/Support/ARMAttributeParser.cpp
@@ -84,7 +84,7 @@ Error ARMAttributeParser::stringAttribute(AttrType tag) {
   return Error::success();
 }
 
-static const char *CPU_arch_strings[] = {
+static const char *const CPU_arch_strings[] = {
     "Pre-v4", "ARM v4", "ARM v4T", "ARM v5T", "ARM v5TE", "ARM v5TEJ",
     "ARM v6", "ARM v6KZ", "ARM v6T2", "ARM v6K", "ARM v7", "ARM v6-M",
     "ARM v6S-M", "ARM v7E-M", "ARM v8-A", "ARM v8-R", "ARM v8-M Baseline",
@@ -113,101 +113,104 @@ Error ARMAttributeParser::CPU_arch_profile(AttrType tag) {
 }
 
 Error ARMAttributeParser::ARM_ISA_use(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Permitted"};
+  static const char *const strings[] = {"Not Permitted", "Permitted"};
   return parseStringAttribute("ARM_ISA_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::THUMB_ISA_use(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Thumb-1", "Thumb-2", "Permitted"};
+  static const char *const strings[] = {
+    "Not Permitted", "Thumb-1", "Thumb-2", "Permitted"};
   return parseStringAttribute("THUMB_ISA_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::FP_arch(AttrType tag) {
-  static const char *strings[] = {
+  static const char *const strings[] = {
       "Not Permitted", "VFPv1",     "VFPv2",      "VFPv3",         "VFPv3-D16",
       "VFPv4",         "VFPv4-D16", "ARMv8-a FP", "ARMv8-a FP-D16"};
   return parseStringAttribute("FP_arch", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::WMMX_arch(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "WMMXv1", "WMMXv2"};
+  static const char *const strings[] = {"Not Permitted", "WMMXv1", "WMMXv2"};
   return parseStringAttribute("WMMX_arch", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::Advanced_SIMD_arch(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "NEONv1", "NEONv2+FMA",
-                                  "ARMv8-a NEON", "ARMv8.1-a NEON"};
+  static const char *const strings[] = {"Not Permitted", "NEONv1", "NEONv2+FMA",
+                                        "ARMv8-a NEON", "ARMv8.1-a NEON"};
   return parseStringAttribute("Advanced_SIMD_arch", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::MVE_arch(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "MVE integer",
-                                  "MVE integer and float"};
+  static const char *const strings[] = {"Not Permitted", "MVE integer",
+                                        "MVE integer and float"};
   return parseStringAttribute("MVE_arch", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::PCS_config(AttrType tag) {
-  static const char *strings[] = {
+  static const char *const strings[] = {
     "None", "Bare Platform", "Linux Application", "Linux DSO", "Palm OS 2004",
     "Reserved (Palm OS)", "Symbian OS 2004", "Reserved (Symbian OS)"};
   return parseStringAttribute("PCS_config", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_PCS_R9_use(AttrType tag) {
-  static const char *strings[] = {"v6", "Static Base", "TLS", "Unused"};
+  static const char *const strings[] = {"v6", "Static Base", "TLS", "Unused"};
   return parseStringAttribute("ABI_PCS_R9_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_PCS_RW_data(AttrType tag) {
-  static const char *strings[] = {"Absolute", "PC-relative", "SB-relative",
-                                  "Not Permitted"};
+  static const char *const strings[] = {"Absolute", "PC-relative",
+                                        "SB-relative", "Not Permitted"};
   return parseStringAttribute("ABI_PCS_RW_data", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_PCS_RO_data(AttrType tag) {
-  static const char *strings[] = {"Absolute", "PC-relative", "Not Permitted"};
+  static const char *const strings[] = {"Absolute", "PC-relative",
+                                        "Not Permitted"};
   return parseStringAttribute("ABI_PCS_RO_data", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_PCS_GOT_use(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Direct", "GOT-Indirect"};
+  static const char *const strings[] = {"Not Permitted", "Direct",
+                                        "GOT-Indirect"};
   return parseStringAttribute("ABI_PCS_GOT_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_PCS_wchar_t(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Unknown", "2-byte",
-                                  "Unknown", "4-byte"};
+  static const char *const strings[] = {"Not Permitted", "Unknown", "2-byte",
+                                        "Unknown", "4-byte"};
   return parseStringAttribute("ABI_PCS_wchar_t", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_FP_rounding(AttrType tag) {
-  static const char *strings[] = {"IEEE-754", "Runtime"};
+  static const char *const strings[] = {"IEEE-754", "Runtime"};
   return parseStringAttribute("ABI_FP_rounding", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_FP_denormal(AttrType tag) {
-  static const char *strings[] = {"Unsupported", "IEEE-754", "Sign Only"};
+  static const char *const strings[] = {"Unsupported", "IEEE-754", "Sign Only"};
   return parseStringAttribute("ABI_FP_denormal", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_FP_exceptions(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "IEEE-754"};
+  static const char *const strings[] = {"Not Permitted", "IEEE-754"};
   return parseStringAttribute("ABI_FP_exceptions", tag, ArrayRef(strings));
 }
 Error ARMAttributeParser::ABI_FP_user_exceptions(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "IEEE-754"};
+  static const char *const strings[] = {"Not Permitted", "IEEE-754"};
   return parseStringAttribute("ABI_FP_user_exceptions", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_FP_number_model(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Finite Only", "RTABI",
-                                  "IEEE-754"};
+  static const char *const strings[] = {"Not Permitted", "Finite Only", "RTABI",
+                                        "IEEE-754"};
   return parseStringAttribute("ABI_FP_number_model", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_align_needed(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "8-byte alignment",
-                                  "4-byte alignment", "Reserved"};
+  static const char *const strings[] = {"Not Permitted", "8-byte alignment",
+                                        "4-byte alignment", "Reserved"};
 
   uint64_t value = de.getULEB128(cursor);
 
@@ -244,30 +247,30 @@ Error ARMAttributeParser::ABI_align_preserved(AttrType tag) {
 }
 
 Error ARMAttributeParser::ABI_enum_size(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Packed", "Int32",
-                                  "External Int32"};
+  static const char *const strings[] = {"Not Permitted", "Packed", "Int32",
+                                        "External Int32"};
   return parseStringAttribute("ABI_enum_size", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_HardFP_use(AttrType tag) {
-  static const char *strings[] = {"Tag_FP_arch", "Single-Precision", "Reserved",
-                                  "Tag_FP_arch (deprecated)"};
+  static const char *const strings[] = {"Tag_FP_arch", "Single-Precision",
+                                        "Reserved", "Tag_FP_arch (deprecated)"};
   return parseStringAttribute("ABI_HardFP_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_VFP_args(AttrType tag) {
-  static const char *strings[] = {"AAPCS", "AAPCS VFP", "Custom",
-                                  "Not Permitted"};
+  static const char *const strings[] = {"AAPCS", "AAPCS VFP", "Custom",
+                                        "Not Permitted"};
   return parseStringAttribute("ABI_VFP_args", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_WMMX_args(AttrType tag) {
-  static const char *strings[] = {"AAPCS", "iWMMX", "Custom"};
+  static const char *const strings[] = {"AAPCS", "iWMMX", "Custom"};
   return parseStringAttribute("ABI_WMMX_args", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_optimization_goals(AttrType tag) {
-  static const char *strings[] = {
+  static const char *const strings[] = {
     "None", "Speed", "Aggressive Speed", "Size", "Aggressive Size", "Debugging",
     "Best Debugging"
   };
@@ -275,7 +278,7 @@ Error ARMAttributeParser::ABI_optimization_goals(AttrType tag) {
 }
 
 Error ARMAttributeParser::ABI_FP_optimization_goals(AttrType tag) {
-  static const char *strings[] = {
+  static const char *const strings[] = {
       "None",     "Speed",        "Aggressive Speed", "Size", "Aggressive Size",
       "Accuracy", "Best Accuracy"};
   return parseStringAttribute("ABI_FP_optimization_goals", tag,
@@ -309,66 +312,67 @@ Error ARMAttributeParser::compatibility(AttrType tag) {
 }
 
 Error ARMAttributeParser::CPU_unaligned_access(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "v6-style"};
+  static const char *const strings[] = {"Not Permitted", "v6-style"};
   return parseStringAttribute("CPU_unaligned_access", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::FP_HP_extension(AttrType tag) {
-  static const char *strings[] = {"If Available", "Permitted"};
+  static const char *const strings[] = {"If Available", "Permitted"};
   return parseStringAttribute("FP_HP_extension", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::ABI_FP_16bit_format(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "IEEE-754", "VFPv3"};
+  static const char *const strings[] = {"Not Permitted", "IEEE-754", "VFPv3"};
   return parseStringAttribute("ABI_FP_16bit_format", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::MPextension_use(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Permitted"};
+  static const char *const strings[] = {"Not Permitted", "Permitted"};
   return parseStringAttribute("MPextension_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::DIV_use(AttrType tag) {
-  static const char *strings[] = {"If Available", "Not Permitted", "Permitted"};
+  static const char *const strings[] = {"If Available", "Not Permitted",
+                                        "Permitted"};
   return parseStringAttribute("DIV_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::DSP_extension(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Permitted"};
+  static const char *const strings[] = {"Not Permitted", "Permitted"};
   return parseStringAttribute("DSP_extension", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::T2EE_use(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Permitted"};
+  static const char *const strings[] = {"Not Permitted", "Permitted"};
   return parseStringAttribute("T2EE_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::Virtualization_use(AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "TrustZone",
-                                  "Virtualization Extensions",
-                                  "TrustZone + Virtualization Extensions"};
+  static const char *const strings[] = {
+    "Not Permitted", "TrustZone", "Virtualization Extensions",
+    "TrustZone + Virtualization Extensions"};
   return parseStringAttribute("Virtualization_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::PAC_extension(ARMBuildAttrs::AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Permitted in NOP space",
-                                  "Permitted"};
+  static const char *const strings[] = {
+    "Not Permitted", "Permitted in NOP space", "Permitted"};
   return parseStringAttribute("PAC_extension", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::BTI_extension(ARMBuildAttrs::AttrType tag) {
-  static const char *strings[] = {"Not Permitted", "Permitted in NOP space",
-                                  "Permitted"};
+  static const char *const strings[] = {
+    "Not Permitted", "Permitted in NOP space", "Permitted"};
   return parseStringAttribute("BTI_extension", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::PACRET_use(ARMBuildAttrs::AttrType tag) {
-  static const char *strings[] = {"Not Used", "Used"};
+  static const char *const strings[] = {"Not Used", "Used"};
   return parseStringAttribute("PACRET_use", tag, ArrayRef(strings));
 }
 
 Error ARMAttributeParser::BTI_use(ARMBuildAttrs::AttrType tag) {
-  static const char *strings[] = {"Not Used", "Used"};
+  static const char *const strings[] = {"Not Used", "Used"};
   return parseStringAttribute("BTI_use", tag, ArrayRef(strings));
 }
 
diff --git a/llvm/lib/Support/CSKYAttributeParser.cpp b/llvm/lib/Support/CSKYAttributeParser.cpp
index 7f39a78fe08b4..40ee617b981b2 100644
--- a/llvm/lib/Support/CSKYAttributeParser.cpp
+++ b/llvm/lib/Support/CSKYAttributeParser.cpp
@@ -82,38 +82,39 @@ Error CSKYAttributeParser::handler(uint64_t tag, bool &handled) {
 }
 
 Error CSKYAttributeParser::dspVersion(unsigned tag) {
-  static const char *strings[] = {"Error", "DSP Extension", "DSP 2.0"};
+  static const char *const strings[] = {"Error", "DSP Extension", "DSP 2.0"};
   return parseStringAttribute("Tag_CSKY_DSP_VERSION", tag, ArrayRef(strings));
 }
 
 Error CSKYAttributeParser::vdspVersion(unsigned tag) {
-  static const char *strings[] = {"Error", "VDSP Version 1", "VDSP Version 2"};
+  static const char *const strings[] = {"Error", "VDSP Version 1",
+                                        "VDSP Version 2"};
   return parseStringAttribute("Tag_CSKY_VDSP_VERSION", tag, ArrayRef(strings));
 }
 
 Error CSKYAttributeParser::fpuVersion(unsigned tag) {
-  static const char *strings[] = {"Error", "FPU Version 1", "FPU Version 2",
-                                  "FPU Version 3"};
+  static const char *const strings[] = {"Error", "FPU Version 1",
+                                        "FPU Version 2", "FPU Version 3"};
   return parseStringAttribute("Tag_CSKY_FPU_VERSION", tag, ArrayRef(strings));
 }
 
 Error CSKYAttributeParser::fpuABI(unsigned tag) {
-  static const char *strings[] = {"Error", "Soft", "SoftFP", "Hard"};
+  static const char *const strings[] = {"Error", "Soft", "SoftFP", "Hard"};
   return parseStringAttribute("Tag_CSKY_FPU_ABI", tag, ArrayRef(strings));
 }
 
 Error CSKYAttributeParser::fpuRounding(unsigned tag) {
-  static const char *strings[] = {"None", "Needed"};
+  static const char *const strings[] = {"None", "Needed"};
   return parseStringAttribute("Tag_CSKY_FPU_ROUNDING", tag, ArrayRef(strings));
 }
 
 Error CSKYAttributeParser::fpuDenormal(unsigned tag) {
-  static const char *strings[] = {"None", "Needed"};
+  static const char *const strings[] = {"None", "Needed"};
   return parseStringAttribute("Tag_CSKY_FPU_DENORMAL", tag, ArrayRef(strings));
 }
 
 Error CSKYAttributeParser::fpuException(unsigned tag) {
-  static const char *strings[] = {"None", "Needed"};
+  static const char *const strings[] = {"None", "Needed"};
   return parseStringAttribute("Tag_CSKY_FPU_EXCEPTION", tag, ArrayRef(strings));
 }
 
diff --git a/llvm/lib/Support/MSP430AttributeParser.cpp b/llvm/lib/Support/MSP430AttributeParser.cpp
index 97764fa4da6fd..4b857a30935f1 100644
--- a/llvm/lib/Support/MSP430AttributeParser.cpp
+++ b/llvm/lib/Support/MSP430AttributeParser.cpp
@@ -21,22 +21,22 @@ constexpr std::array<MSP430AttributeParser::DisplayHandler, 4>
          {MSP430Attrs::TagEnumSize, &MSP430AttributeParser::parseEnumSize}}};
 
 Error MSP430AttributeParser::parseISA(AttrType Tag) {
-  static const char *StringVals[] = {"None", "MSP430", "MSP430X"};
+  static const char *const StringVals[] = {"None", "MSP430", "MSP430X"};
   return parseStringAttribute("ISA", Tag, ArrayRef(StringVals));
 }
 
 Error MSP430AttributeParser::parseCodeModel(AttrType Tag) {
-  static const char *StringVals[] = {"None", "Small", "Large"};
+  static const char *const StringVals[] = {"None", "Small", "Large"};
   return parseStringAttribute("Code Model", Tag, ArrayRef(StringVals));
 }
 
 Error MSP430AttributeParser::parseDataModel(AttrType Tag) {
-  static const char *StringVals[] = {"None", "Small", "Large", "Restricted"};
+  static const char *const StringVals[] = {"None", "Small", "Large", "Restricted"};
   return parseStringAttribute("Data Model", Tag, ArrayRef(StringVals));
 }
 
 Error MSP430AttributeParser::parseEnumSize(AttrType Tag) {
-  static const char *StringVals[] = {"None", "Small", "Integer", "Don't Care"};
+  static const char *const StringVals[] = {"None", "Small", "Integer", "Don't Care"};
   return parseStringAttribute("Enum Size", Tag, ArrayRef(StringVals));
 }
 
diff --git a/llvm/lib/Support/RISCVAttributeParser.cpp b/llvm/lib/Support/RISCVAttributeParser.cpp
index 19c5a0e06903f..551c6bc29f518 100644
--- a/llvm/lib/Support/RISCVAttributeParser.cpp
+++ b/llvm/lib/Support/RISCVAttributeParser.cpp
@@ -50,7 +50,7 @@ Error RISCVAttributeParser::atomicAbi(unsigned Tag) {
 }
 
 Error RISCVAttributeParser::unalignedAccess(unsigned tag) {
-  static const char *strings[] = {"No unaligned access", "Unaligned access"};
+  static const char *const strings[] = {"No unaligned access", "Unaligned access"};
   return parseStringAttribute("Unaligned_access", tag, ArrayRef(strings));
 }

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 1, 2024 •
edited
Loading

✅ With the latest revision this PR passed the C/C++ code formatter.

@pfusik pfusik force-pushed the parseStringAttribute-const branch 2 times, most recently from 203145b to fa68077 Compare August 1, 2024 08:19
@pfusik pfusik requested review from stuij and vhscampos August 1, 2024 09:08
@vhscampos
Copy link
Member

vhscampos commented Aug 2, 2024 •
edited
Loading

The changes look good to me, but the commit message is wrong. It's not the arguments (formal) that are made const, but rather the pointers. Another option is to make clear that the real arguments are made const.

@pfusik
Copy link
Contributor Author

pfusik commented Aug 2, 2024

The changes look good to me, but the commit message is wrong. It's not the arguments (formal) that are made const, but rather the pointers. Another option is to make clear that the real arguments are made const.

What pointers do you mean? It's the arrays that I make const.
These arrays are passed as arguments, wrapped in ArrayRef.
Any suggestion for a better commit message?

@vhscampos
Copy link
Member

I meant the arrays, yes. Sorry for the confusion. I said "pointers" with the meaning of pointer-to-pointers.

I suggest the commit title says just "Make string arrays const".

@pfusik pfusik force-pushed the parseStringAttribute-const branch from fa68077 to 6107c49 Compare August 2, 2024 09:21
@pfusik
Copy link
Contributor Author

pfusik commented Aug 2, 2024

I suggest the commit title says just "Make string arrays const".

Done.

@pfusik pfusik merged commit 1c1b8c2 into llvm:main Aug 2, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vhscampos vhscampos vhscampos approved these changes

@stuij stuij Awaiting requested review from stuij

Assignees
No one assigned
Labels
backend:RISC-V llvm:support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pfusik @llvmbot @vhscampos