Skip to content

Commit 3bf8f94

Browse files
dylanjtuttledylanjtuttle
committed
Fix string literal conversion warnings in runtime/compiler/optimizer
Fix string literal conversion warnings in runtime/compiler/optimizer Signed-off-by: Dylan Tuttle <[email protected]>
1 parent c2585de commit 3bf8f94

12 files changed

+208
-208
lines changed

‎runtime/compiler/optimizer/DataAccessAccelerator.cpp

Lines changed: 148 additions & 148 deletions
Large diffs are not rendered by default.

‎runtime/compiler/optimizer/EscapeAnalysis.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8226,7 +8226,7 @@ void TR_EscapeAnalysis::scanForExtraCallsToInline()
82268226

82278227
TR::TreeTop *callTreeToInline = NULL;
82288228
TR::Node *callNode = NULL;
8229-
char *reason = "??";
8229+
const char *reason = "??";
82308230
if ( tt->getNode()->getNumChildren() >= 1
82318231
&& tt->getNode()->getFirstChild()->getOpCode().isCall()
82328232
&& tt->getNode()->getFirstChild()->getSymbol()->isResolvedMethod())
@@ -8360,7 +8360,7 @@ FieldInfo& Candidate::findOrSetFieldInfo(TR::Node *fieldRefNode, TR::SymbolRefer
83608360
}
83618361

83628362

8363-
void TR_EscapeAnalysis::printCandidates(char *title)
8363+
void TR_EscapeAnalysis::printCandidates(const char *title)
83648364
{
83658365
if (title)
83668366
traceMsg(comp(), "\n%s\n", title);
@@ -8376,7 +8376,7 @@ void TR_EscapeAnalysis::printCandidates(char *title)
83768376
static void printSymRefList(TR_ScratchList<TR::SymbolReference> *list, TR::Compilation *comp)
83778377
{
83788378
ListIterator<TR::SymbolReference> iter(list);
8379-
char *sep = "";
8379+
const char *sep = "";
83808380
for (TR::SymbolReference *symRef = iter.getFirst(); symRef; symRef = iter.getNext())
83818381
{
83828382
traceMsg(comp, "%s#%d", sep, symRef->getReferenceNumber());

‎runtime/compiler/optimizer/EscapeAnalysis.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ class TR_EscapeAnalysis : public TR::Optimization
673673
void setHasFlushOnEntry(int32_t blockNum) {_blocksWithFlushOnEntry->set(blockNum);}
674674
void rememoize(Candidate *c, bool mayDememoizeNextTime=false);
675675

676-
void printCandidates(char *);
676+
void printCandidates(const char *);
677677

678678
char *getClassName(TR::Node *classNode);
679679

‎runtime/compiler/optimizer/IdiomRecognition.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3363,13 +3363,13 @@ TR_CISCTransformer::isBlockInLoopBody(TR::Block *block)
33633363

33643364

33653365
void
3366-
TR_CISCTransformer::showEmbeddedData(char *title, uint8_t *data)
3366+
TR_CISCTransformer::showEmbeddedData(const char *title, uint8_t *data)
33673367
{
33683368
int32_t i, j;
3369-
traceMsg(comp(), "%s\n ",title);
3369+
traceMsg(comp(), "%s\n ", title);
33703370
for (j = 0; j < _numPNodes; j++)
33713371
{
3372-
traceMsg(comp(), "%3d",j);
3372+
traceMsg(comp(), "%3d", j);
33733373
}
33743374
traceMsg(comp(), "\n --");
33753375
for (j = 0; j < _numPNodes; j++)
@@ -3386,7 +3386,7 @@ TR_CISCTransformer::showEmbeddedData(char *title, uint8_t *data)
33863386
if (this_result == _Unknown || this_result == _NotEmbed)
33873387
traceMsg(comp(), "| ");
33883388
else
3389-
traceMsg(comp(), "| %X",data[idx(j, i)]);
3389+
traceMsg(comp(), "| %X", data[idx(j, i)]);
33903390
}
33913391
traceMsg(comp(), "\n");
33923392
}
@@ -5144,7 +5144,7 @@ TR_CISCTransformer::moveCISCNodesInList(List<TR_CISCNode> *l, TR_CISCNode *from,
51445144
// * _T->_orderByData
51455145
//*****************************************************************************
51465146
void
5147-
TR_CISCTransformer::moveCISCNodes(TR_CISCNode *from, TR_CISCNode *to, TR_CISCNode *moveTo, char *debugStr)
5147+
TR_CISCTransformer::moveCISCNodes(TR_CISCNode *from, TR_CISCNode *to, TR_CISCNode *moveTo, const char *debugStr)
51485148
{
51495149
if (showMesssagesStdout())
51505150
{
@@ -7665,7 +7665,7 @@ TR_CISCTransformer::computeTopologicalEmbedding(TR_CISCGraph *P, TR_CISCGraph *T
76657665

76667666
if (trace() || showMesssagesStdout())
76677667
{
7668-
char *bcinfo = "";
7668+
char *bcinfo = (char *)"";
76697669
#if SHOW_BCINDICES
76707670
char tmpbuf[256];
76717671
int32_t minIndex, maxIndex;

‎runtime/compiler/optimizer/IdiomRecognition.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@ class TR_CISCTransformer : public TR_LoopTransformer
13041304

13051305
bool computeTopologicalEmbedding(TR_CISCGraph *P, TR_CISCGraph *T);
13061306
bool embeddingHasConflictingBranches();
1307-
void showEmbeddedData(char *title, uint8_t *data);
1307+
void showEmbeddedData(const char *title, uint8_t *data);
13081308
bool computeEmbeddedForData();
13091309
bool computeEmbeddedForCFG();
13101310
bool dagEmbed(TR_CISCNode *, TR_CISCNode*);
@@ -1452,7 +1452,7 @@ class TR_CISCTransformer : public TR_LoopTransformer
14521452
void showCandidates();
14531453
void registerCandidates();
14541454
void moveCISCNodesInList(List<TR_CISCNode> *l, TR_CISCNode *from, TR_CISCNode *to, TR_CISCNode *moveTo);
1455-
void moveCISCNodes(TR_CISCNode *from, TR_CISCNode *to, TR_CISCNode *moveTo, char *debugStr = NULL);
1455+
void moveCISCNodes(TR_CISCNode *from, TR_CISCNode *to, TR_CISCNode *moveTo, const char *debugStr = NULL);
14561456
TR::Block *searchPredecessorOfBlock(TR::Block *block);
14571457
TR::Block *modifyBlockByVersioningCheck(TR::Block *block, TR::TreeTop *startTop, TR::Node *lengthNode, List<TR::Node> *guardList = NULL);
14581458
TR::Block *modifyBlockByVersioningCheck(TR::Block *block, TR::TreeTop *startTop, List<TR::Node> *guardList);

‎runtime/compiler/optimizer/InlinerTempForJ9.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ static int32_t getJ9InitialBytecodeSize(TR_ResolvedMethod * feMethod, TR::Resolv
173173

174174
static bool insideIntPipelineForEach(TR_ResolvedMethod *method, TR::Compilation *comp)
175175
{
176-
char *sig = "accept";
176+
const char *sig = "accept";
177177
bool returnValue = true; //default is true since if first method is IntPipeline.forEach true is returned
178178

179179
//Searches up the owning method chain until IntPipeline.forEach is found
@@ -3490,7 +3490,7 @@ void TR_MultipleCallTargetInliner::weighCallSite( TR_CallStack * callStack , TR_
34903490
if (isHot(comp()))
34913491
{
34923492
TR_ResolvedMethod *m = calltarget->_calleeSymbol->getResolvedMethod();
3493-
char *sig = "toString";
3493+
const char *sig = "toString";
34943494
if (strncmp(m->nameChars(), sig, strlen(sig)) == 0)
34953495
{
34963496
size >>= 1;

‎runtime/compiler/optimizer/J9Inliner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ extern int32_t *InlinedSizes; // Defined in Inliner.cpp
6060

6161

6262
//duplicated as long as there are two versions of findInlineTargets
63-
static uintptr_t *failMCS(char *reason, TR_CallSite *callSite, TR_InlinerBase* inliner)
63+
static uintptr_t *failMCS(const char *reason, TR_CallSite *callSite, TR_InlinerBase* inliner)
6464
{
6565
debugTrace(inliner->tracer()," Fail isMutableCallSiteTargetInvokeExact(%p): %s", callSite, reason);
6666
return NULL;
@@ -440,7 +440,7 @@ bool TR_InlinerBase::inlineCallTarget(TR_CallStack *callStack, TR_CallTarget *ca
440440

441441
TR_InlinerDelimiter delimiter(tracer(),"TR_InlinerBase::inlineCallTarget");
442442

443-
char *sig = "multiLeafArrayCopy";
443+
const char *sig = "multiLeafArrayCopy";
444444
if (strncmp(calltarget->_calleeMethod->nameChars(), sig, strlen(sig)) == 0)
445445
{
446446
_nodeCountThreshold = 8192;

‎runtime/compiler/optimizer/J9ValuePropagation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3542,7 +3542,7 @@ bool J9::ValuePropagation::isUnreliableSignatureType(
35423542
return true;
35433543
}
35443544

3545-
static void getHelperSymRefs(OMR::ValuePropagation *vp, TR::Node *curCallNode, TR::SymbolReference *&getHelpersSymRef, TR::SymbolReference *&helperSymRef, char *helperSig, int32_t helperSigLen, TR::MethodSymbol::Kinds helperCallKind)
3545+
static void getHelperSymRefs(OMR::ValuePropagation *vp, TR::Node *curCallNode, TR::SymbolReference *&getHelpersSymRef, TR::SymbolReference *&helperSymRef, const char *helperSig, int32_t helperSigLen, TR::MethodSymbol::Kinds helperCallKind)
35463546
{
35473547
//Function to retrieve the JITHelpers.getHelpers and JITHelpers.<helperSig> method symbol references.
35483548
//

‎runtime/compiler/optimizer/SignExtendLoads.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@
4949
// -------------------------------------------------------------------------------------------
5050
bool shouldEnableSEL(TR::Compilation *comp)
5151
{
52-
static char * enableSEL = feGetEnv("TR_SIGNEXTENDLOADS");
52+
static const char *enableSEL = feGetEnv("TR_SIGNEXTENDLOADS");
5353
if (comp->target().cpu.isZ())
5454
{
5555
// enable only for 390
56-
static char * nenableSEL = feGetEnv("TR_NSIGNEXTENDLOADS");
57-
if(nenableSEL ==NULL) enableSEL = "enable";
56+
static const char *nenableSEL = feGetEnv("TR_NSIGNEXTENDLOADS");
57+
if (nenableSEL == NULL) enableSEL = "enable";
5858
}
5959
return ((enableSEL != NULL) &&
6060
comp->target().is64Bit());

‎runtime/compiler/optimizer/StringPeepholes.cpp

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -161,41 +161,41 @@ TR::SymbolReference* TR_StringPeepholes::MethodEnumToArgsForMethodSymRefFromName
161161
m != END_STRINGPEEPHOLES_METHODS , "wrong constant!!");
162162

163163

164-
static char* classNames [] = {"java/math/BigDecimal",
165-
"java/math/BigDecimal",
166-
"java/math/BigDecimal",
167-
"java/math/BigDecimal",
168-
NULL,
169-
"java/lang/String",
170-
"java/lang/String",
171-
"java/lang/String",
172-
"java/lang/String",
173-
"java/lang/String",
174-
"java/lang/String"};
175-
176-
static char* methodNames [] = {"SMAAMSS",
177-
"SMSS",
178-
"AAMSS",
179-
"MSS",
180-
NULL,
181-
"<init>",
182-
"<init>",
183-
"<init>",
184-
"<init>",
185-
"<init>",
186-
"<init>"};
187-
188-
static char* signatures [] = { "(Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;IIII)Ljava/math/BigDecimal;",
189-
"(Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;II)Ljava/math/BigDecimal;",
190-
"(Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;III)Ljava/math/BigDecimal;",
191-
"(Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;",
192-
NULL,
193-
"(Ljava/lang/String;C)V",
194-
"(Ljava/lang/String;Ljava/lang/String;)V",
195-
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
196-
"(Ljava/lang/String;I)V",
197-
"([BIIZ)V",
198-
"(ILjava/lang/String;ILjava/lang/String;Ljava/lang/String;)V"};
164+
static const char* classNames [] = {"java/math/BigDecimal",
165+
"java/math/BigDecimal",
166+
"java/math/BigDecimal",
167+
"java/math/BigDecimal",
168+
NULL,
169+
"java/lang/String",
170+
"java/lang/String",
171+
"java/lang/String",
172+
"java/lang/String",
173+
"java/lang/String",
174+
"java/lang/String"};
175+
176+
static const char* methodNames [] = {"SMAAMSS",
177+
"SMSS",
178+
"AAMSS",
179+
"MSS",
180+
NULL,
181+
"<init>",
182+
"<init>",
183+
"<init>",
184+
"<init>",
185+
"<init>",
186+
"<init>"};
187+
188+
static const char* signatures [] = {"(Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;IIII)Ljava/math/BigDecimal;",
189+
"(Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;II)Ljava/math/BigDecimal;",
190+
"(Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;Ljava/math/BigDecimal;III)Ljava/math/BigDecimal;",
191+
"(Ljava/math/BigDecimal;Ljava/math/BigDecimal;I)Ljava/math/BigDecimal;",
192+
NULL,
193+
"(Ljava/lang/String;C)V",
194+
"(Ljava/lang/String;Ljava/lang/String;)V",
195+
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
196+
"(Ljava/lang/String;I)V",
197+
"([BIIZ)V",
198+
"(ILjava/lang/String;ILjava/lang/String;Ljava/lang/String;)V"};
199199

200200
// TODO: This is a workaround as we switched to using a byte[] backing array in String*. Remove this workaround once obsolete.
201201
if (m == SPH_String_init_AIIZ)
@@ -2088,7 +2088,7 @@ TR::TreeTop *TR_StringPeepholes::searchForStringAppend(const char *sig, TR::Tree
20882088
}
20892089
else
20902090
{
2091-
char *sig2 = "java/lang/Integer.toString(I)";
2091+
const char *sig2 = "java/lang/Integer.toString(I)";
20922092

20932093
// Expected reference count for the Integer.toString may change if pending pushes are being
20942094
// generated

‎runtime/compiler/optimizer/VPBCDConstraint.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ TR::VP_BCDValue *TR::VP_BCDValue::asBCDValue() { return
5858
TR::VP_BCDSign *TR::VP_BCDSign::asBCDSign() { return this; }
5959

6060

61-
char *TR::VP_BCDSign::TR_BCDSignConstraintNames[TR_Sign_Num_Types] =
61+
const char *TR::VP_BCDSign::TR_BCDSignConstraintNames[TR_Sign_Num_Types] =
6262
{
6363
"<unknown_sign_state>",
6464
"<clean>",

‎runtime/compiler/optimizer/VPBCDConstraint.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ class VP_BCDSign : public TR::VPConstraint
8989

9090
static bool signsAreConsistent(TR_BCDSignConstraint signOne, TR_BCDSignConstraint signTwo);
9191

92-
char *getName()
92+
const char *getName()
9393
{ return getName(_sign); }
9494

95-
static char *getName(TR_BCDSignConstraint sign)
95+
static const char *getName(TR_BCDSignConstraint sign)
9696
{ return ((sign < TR_Sign_Num_Types) ? TR_BCDSignConstraintNames[sign] : (char*)"invalid_sign_constraint"); }
9797

9898
static TR_BCDSignConstraint getSignConstraintFromBCDSign(TR_BCDSignCode bcdSign)
@@ -147,7 +147,7 @@ class VP_BCDSign : public TR::VPConstraint
147147
TR::DataType _dataType;
148148

149149
private:
150-
static char *TR_BCDSignConstraintNames[TR_Sign_Num_Types];
150+
static const char *TR_BCDSignConstraintNames[TR_Sign_Num_Types];
151151
};
152152

153153
class VP_BCDValue : public TR::VP_BCDSign

0 commit comments

Comments
 (0)