Fix string literal conversion warnings in runtime/compiler/compile

Fix string literal conversion warnings in runtime/compiler/compile Signed-off-by: Dylan Tuttle <[email protected]>
eclipse-openj9 · Nov 22, 2023 · c748ee3 · c748ee3
1 parent bf43aec
commit c748ee3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 31 deletions.
diff --git a/runtime/compiler/compile/J9Compilation.cpp b/runtime/compiler/compile/J9Compilation.cpp
@@ -444,7 +444,7 @@ J9::Compilation::isConverterMethod(TR::RecognizedMethod rm)
       case TR::sun_nio_cs_UTF_16_Encoder_encodeUTF16Little:
          return true;
       default:
-      	return false;
+         return false;
       }
 
    return false;
@@ -1526,33 +1526,33 @@ J9::Compilation::notYetRunMeansCold()
                              self()->getOptions()->getInitialBCount() :
                              self()->getOptions()->getInitialCount();
 
-    switch (currentMethod->getRecognizedMethod())
-       {
-       case TR::com_ibm_jit_DecimalFormatHelper_formatAsDouble:
-       case TR::com_ibm_jit_DecimalFormatHelper_formatAsFloat:
-          initialCount = 0;
-          break;
-       default:
-          break;
-       }
-
-    if (currentMethod->containingClass() == self()->getStringClassPointer())
-       {
-       if (currentMethod->isConstructor())
-          {
-          char *sig = currentMethod->signatureChars();
-          if (!strncmp(sig, "([CIIII)", 8) ||
-              !strncmp(sig, "([CIICII)", 9) ||
-              !strncmp(sig, "(II[C)", 6))
-             initialCount = 0;
-          }
-       else
-          {
-          char *sig = "isRepeatedCharCacheHit";
-          if (strncmp(currentMethod->nameChars(), sig, strlen(sig)) == 0)
-             initialCount = 0;
-          }
-       }
+   switch (currentMethod->getRecognizedMethod())
+      {
+      case TR::com_ibm_jit_DecimalFormatHelper_formatAsDouble:
+      case TR::com_ibm_jit_DecimalFormatHelper_formatAsFloat:
+         initialCount = 0;
+         break;
+      default:
+         break;
+      }
+
+   if (currentMethod->containingClass() == self()->getStringClassPointer())
+      {
+      if (currentMethod->isConstructor())
+         {
+         const char *sig = currentMethod->signatureChars();
+         if (!strncmp(sig, "([CIIII)", 8) ||
+             !strncmp(sig, "([CIICII)", 9) ||
+             !strncmp(sig, "(II[C)", 6))
+            initialCount = 0;
+         }
+      else
+         {
+         const char *sig = "isRepeatedCharCacheHit";
+         if (strncmp(currentMethod->nameChars(), sig, strlen(sig)) == 0)
+            initialCount = 0;
+         }
+      }
 
    if (
       self()->isDLT()

diff --git a/runtime/compiler/compile/J9SymbolReferenceTable.cpp b/runtime/compiler/compile/J9SymbolReferenceTable.cpp
@@ -719,7 +719,14 @@ J9::SymbolReferenceTable::findOrCreateJavaLangReferenceReferentShadowSymbol(
 // Right now it only works for private fields or fields that are guaranteed to be accessed only from one class
 // because searchRecognizedField only does a name comparison, t does not work if the field is accessed from a subclass of the expected one
 TR::SymbolReference *
-J9::SymbolReferenceTable::findOrFabricateShadowSymbol(TR::ResolvedMethodSymbol * owningMethodSymbol, TR::Symbol::RecognizedField recognizedField, TR::DataType type, uint32_t offset, bool isVolatile, bool isPrivate, bool isFinal, char* name)
+J9::SymbolReferenceTable::findOrFabricateShadowSymbol(TR::ResolvedMethodSymbol *owningMethodSymbol,
+                                                      TR::Symbol::RecognizedField recognizedField,
+                                                      TR::DataType type,
+                                                      uint32_t offset,
+                                                      bool isVolatile,
+                                                      bool isPrivate,
+                                                      bool isFinal,
+                                                      const char *name)
    {
    TR_ResolvedMethod * owningMethod = owningMethodSymbol->getResolvedMethod();
 

diff --git a/runtime/compiler/compile/J9SymbolReferenceTable.hpp b/runtime/compiler/compile/J9SymbolReferenceTable.hpp
@@ -175,8 +175,8 @@ class SymbolReferenceTable : public OMR::SymbolReferenceTableConnector
    //
    TR::SymbolReference * findOrCreateDispatchJ9MethodSymbolRef();
 
-   TR::SymbolReference * findOrCreateShadowSymbol(TR::ResolvedMethodSymbol * owningMethodSymbol, int32_t cpIndex, bool isStore);
-   TR::SymbolReference * findOrFabricateShadowSymbol(TR::ResolvedMethodSymbol * owningMethodSymbol, TR::Symbol::RecognizedField recognizedField, TR::DataType type, uint32_t offset, bool isVolatile, bool isPrivate, bool isFinal, char* name = NULL);
+   TR::SymbolReference * findOrCreateShadowSymbol(TR::ResolvedMethodSymbol *owningMethodSymbol, int32_t cpIndex, bool isStore);
+   TR::SymbolReference * findOrFabricateShadowSymbol(TR::ResolvedMethodSymbol *owningMethodSymbol, TR::Symbol::RecognizedField recognizedField, TR::DataType type, uint32_t offset, bool isVolatile, bool isPrivate, bool isFinal, const char *name = NULL);
 
    /** \brief
     *     Returns a symbol reference for an entity not present in the constant pool.