Skip to content

Commit

Permalink
Fix string literal conversion warnings in runtime/compiler/il
Browse files Browse the repository at this point in the history
Fix string literal conversion warnings in runtime/compiler/il

Signed-off-by: Dylan Tuttle <[email protected]>
  • Loading branch information
dylanjtuttle committed Nov 22, 2023
1 parent 252c120 commit b114a1a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions runtime/compiler/il/J9DataTypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions runtime/compiler/il/J9DataTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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];
};

}
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/il/J9Symbol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/il/J9SymbolReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit b114a1a

Please sign in to comment.