From b114a1a8f39dde4b5ca5ddd662267f91c8655ea6 Mon Sep 17 00:00:00 2001
From: Dylan Tuttle <jdylantuttle@gmail.com>
Date: Mon, 6 Nov 2023 08:18:11 -0800
Subject: [PATCH] Fix string literal conversion warnings in runtime/compiler/il

Fix string literal conversion warnings in runtime/compiler/il

Signed-off-by: Dylan Tuttle <jdylantuttle@gmail.com>
---
 runtime/compiler/il/J9DataTypes.cpp       |  4 ++--
 runtime/compiler/il/J9DataTypes.hpp       | 14 +++++++-------
 runtime/compiler/il/J9Symbol.cpp          |  2 +-
 runtime/compiler/il/J9SymbolReference.cpp |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/runtime/compiler/il/J9DataTypes.cpp b/runtime/compiler/il/J9DataTypes.cpp
index 35c146b9e61..6795ef49b49 100644
--- a/runtime/compiler/il/J9DataTypes.cpp
+++ b/runtime/compiler/il/J9DataTypes.cpp
@@ -147,7 +147,7 @@ const int32_t packedDecimalPrecisionToByteLengthMap[TR_MAX_DECIMAL_PRECISION+1]
 
 
 
-char *J9::DataType::_TR_RawBCDSignCodeNames[num_raw_bcd_sign_codes] =
+const char *J9::DataType::_TR_RawBCDSignCodeNames[num_raw_bcd_sign_codes] =
    {
    "raw_bcd_sign_unknown",
    "0xc",
@@ -163,7 +163,7 @@ int32_t J9::DataType::_TR_RawBCDSignCodeValues[num_raw_bcd_sign_codes] =
    0xf,                                  // raw_bcd_sign_0xf
    };
 
-char *J9::DataType::_TR_BCDSignCodeNames[num_bcd_sign_codes] =
+const char *J9::DataType::_TR_BCDSignCodeNames[num_bcd_sign_codes] =
    {
    "bcd_sign_unknown",
    "plus",
diff --git a/runtime/compiler/il/J9DataTypes.hpp b/runtime/compiler/il/J9DataTypes.hpp
index 166337935c2..e187d2355b1 100644
--- a/runtime/compiler/il/J9DataTypes.hpp
+++ b/runtime/compiler/il/J9DataTypes.hpp
@@ -251,17 +251,17 @@ class OMR_EXTENSIBLE DataType : public OMR::DataTypeConnector
    static char *getName(TR_RawBCDSignCode s)
       {
       if (s < num_raw_bcd_sign_codes)
-         return _TR_RawBCDSignCodeNames[s];
+         return (char *)_TR_RawBCDSignCodeNames[s];
       else
-         return (char*)"unknown raw sign";
+         return (char *)"unknown raw sign";
       }
 
    static char *getName(TR_BCDSignCode s)
       {
       if (s < num_bcd_sign_codes)
-         return _TR_BCDSignCodeNames[s];
+         return (char *)_TR_BCDSignCodeNames[s];
       else
-         return (char*)"unknown bcd sign";
+         return (char *)"unknown bcd sign";
       }
 
    static int32_t getValue(TR_RawBCDSignCode s)
@@ -345,9 +345,9 @@ class OMR_EXTENSIBLE DataType : public OMR::DataTypeConnector
    static bool normalizedSignIsNegative(TR::DataType dt, TR_BCDSignCode normalizedSign);
 
 private:
-   static char*         _TR_RawBCDSignCodeNames[num_raw_bcd_sign_codes];
-   static int32_t       _TR_RawBCDSignCodeValues[num_raw_bcd_sign_codes];
-   static char*         _TR_BCDSignCodeNames[num_bcd_sign_codes];
+   static const char* _TR_RawBCDSignCodeNames[num_raw_bcd_sign_codes];
+   static int32_t     _TR_RawBCDSignCodeValues[num_raw_bcd_sign_codes];
+   static const char* _TR_BCDSignCodeNames[num_bcd_sign_codes];
    };
 
 }
diff --git a/runtime/compiler/il/J9Symbol.cpp b/runtime/compiler/il/J9Symbol.cpp
index 09981b2fb9a..069e1e5dc46 100644
--- a/runtime/compiler/il/J9Symbol.cpp
+++ b/runtime/compiler/il/J9Symbol.cpp
@@ -202,7 +202,7 @@ J9::Symbol::searchRecognizedField(TR::Compilation * comp, TR_ResolvedMethod * ow
       int32_t  totalLen;
       char    *fieldName;
       fieldName = owningMethod->staticName(cpIndex, totalLen, comp->trMemory());  // totalLen = strlen("<class>" + "<field>" + "<sig>") + 3
-      static char *assertionsDisabledStr = "$assertionsDisabled Z";
+      static const char *assertionsDisabledStr = "$assertionsDisabled Z";
       //string will be of the form "<class>.$assertionsDisabled Z"
       if (declaringClass
           && totalLen >= 22
diff --git a/runtime/compiler/il/J9SymbolReference.cpp b/runtime/compiler/il/J9SymbolReference.cpp
index fae65fcef94..f842f1c8ad8 100644
--- a/runtime/compiler/il/J9SymbolReference.cpp
+++ b/runtime/compiler/il/J9SymbolReference.cpp
@@ -72,7 +72,7 @@ SymbolReference::SymbolReference(
    }
 
 
-static char * dataTypeToSig[] = {0,"B","Z","C","S","I","J","F","D",0,0,0};
+static const char *dataTypeToSig[] = {0, "B", "Z", "C", "S", "I", "J", "F", "D", 0, 0, 0};
 
 /**
  * This method is used when _cpIndex is to be used for resolution.