Skip to content

Commit 3abe74b

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

9 files changed

+45
-45
lines changed

‎compiler/optimizer/Inliner.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -707,11 +707,11 @@ OMR_InlinerPolicy::inlineRecognizedMethod(TR::RecognizedMethod method)
707707

708708
// only dumbinliner uses this and includes checking for variable initialization
709709
bool
710-
TR_DumbInliner::tryToInline(char *message, TR_CallTarget *calltarget)
710+
TR_DumbInliner::tryToInline(const char *message, TR_CallTarget *calltarget)
711711
{
712712
TR_ResolvedMethod *method = calltarget->_calleeSymbol->getResolvedMethod();
713713

714-
if (getPolicy()->tryToInline(calltarget,NULL,true))
714+
if (getPolicy()->tryToInline(calltarget, NULL, true))
715715
{
716716
if (comp()->trace(OMR::inlining))
717717
traceMsg(comp(), "tryToInline pattern matched; %s for %s\n", message, method->signature(comp()->trMemory()));
@@ -6152,7 +6152,7 @@ const char * TR_InlinerTracer::getGuardTypeString(TR_VirtualGuardSelection *guar
61526152
return "???Test";
61536153
}
61546154

6155-
TR_InlinerDelimiter::TR_InlinerDelimiter(TR_InlinerTracer *tracer, char * tag)
6155+
TR_InlinerDelimiter::TR_InlinerDelimiter(TR_InlinerTracer *tracer, const char *tag)
61566156
:_tracer(tracer),_tag(tag)
61576157
{
61586158
debugTrace(tracer,"<%s>",_tag);

‎compiler/optimizer/Inliner.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ class TR_InlinerDelimiter
156156
{
157157

158158
public:
159-
TR_InlinerDelimiter(TR_InlinerTracer * tracer, char * tag);
159+
TR_InlinerDelimiter(TR_InlinerTracer *tracer, const char *tag);
160160
~TR_InlinerDelimiter();
161161

162162
protected:
163-
TR_InlinerTracer * _tracer;
164-
char *_tag;
163+
TR_InlinerTracer *_tracer;
164+
const char *_tag;
165165
};
166166

167167
class TR_Inliner : public TR::Optimization
@@ -435,7 +435,7 @@ class TR_DumbInliner : public TR_InlinerBase
435435
public:
436436
TR_DumbInliner(TR::Optimizer *, TR::Optimization *, uint32_t initialSize, uint32_t dumbReductionIncrement = 5);
437437
virtual bool inlineCallTargets(TR::ResolvedMethodSymbol *, TR_CallStack *, TR_InnerPreexistenceInfo *);
438-
bool tryToInline(char *message, TR_CallTarget *calltarget);
438+
bool tryToInline(const char *message, TR_CallTarget *calltarget);
439439
protected:
440440
virtual bool analyzeCallSite(TR_CallStack *, TR::TreeTop *, TR::Node *, TR::Node *);
441441

‎compiler/optimizer/LocalOpts.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -8970,7 +8970,7 @@ TR_BlockManipulator::breakFallThrough(TR::Block *faller, TR::Block *fallee, bool
89708970

89718971
// used by trivialDeadTreeRemoval opt pass and during CodeGenPrep to remove nodes treetops that have no intervening def
89728972
void
8973-
TR_TrivialDeadTreeRemoval::preProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, char *optDetails, TR::Compilation *comp)
8973+
TR_TrivialDeadTreeRemoval::preProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, const char *optDetails, TR::Compilation *comp)
89748974
{
89758975
TR::Node *ttNode = treeTop->getNode();
89768976
if (ttNode->getOpCodeValue() == TR::treetop &&
@@ -9017,7 +9017,7 @@ TR_TrivialDeadTreeRemoval::preProcessTreetop(TR::TreeTop *treeTop, List<TR::Tree
90179017
}
90189018

90199019
void
9020-
TR_TrivialDeadTreeRemoval::postProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, char *optDetails, TR::Compilation *comp)
9020+
TR_TrivialDeadTreeRemoval::postProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, const char *optDetails, TR::Compilation *comp)
90219021
{
90229022
if (treeTop->isPossibleDef())
90239023
{
@@ -9028,7 +9028,7 @@ TR_TrivialDeadTreeRemoval::postProcessTreetop(TR::TreeTop *treeTop, List<TR::Tre
90289028
}
90299029

90309030
void
9031-
TR_TrivialDeadTreeRemoval::processCommonedChild(TR::Node *child, TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, char *optDetails, TR::Compilation *comp)
9031+
TR_TrivialDeadTreeRemoval::processCommonedChild(TR::Node *child, TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, const char *optDetails, TR::Compilation *comp)
90329032
{
90339033
if (child->getReferenceCount() > 1)
90349034
{

‎compiler/optimizer/LocalOpts.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -858,9 +858,9 @@ class TR_TrivialDeadTreeRemoval : public TR::Optimization
858858
void transformBlock(TR::TreeTop * entryTree, TR::TreeTop * exitTree);
859859
void examineNode(TR::Node *node, vcount_t visitCount);
860860

861-
void preProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, char *optDetails, TR::Compilation *comp);
862-
void postProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, char *optDetails, TR::Compilation *comp);
863-
void processCommonedChild(TR::Node *child, TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, char *optDetails, TR::Compilation *comp);
861+
void preProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, const char *optDetails, TR::Compilation *comp);
862+
void postProcessTreetop(TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, const char *optDetails, TR::Compilation *comp);
863+
void processCommonedChild(TR::Node *child, TR::TreeTop *treeTop, List<TR::TreeTop> &commonedTreeTopList, const char *optDetails, TR::Compilation *comp);
864864
private:
865865
TR_ScratchList<TR::TreeTop> _commonedTreeTopList;
866866
TR::TreeTop *_currentTreeTop;

‎compiler/optimizer/LoopReplicator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ TR_LoopReplicator::TR_LoopReplicator(TR::OptimizationManager *manager)
6565

6666

6767
//Add static debug counter for a given replication failure
68-
static void countReplicationFailure(char *failureReason, int32_t regionNum)
68+
static void countReplicationFailure(const char *failureReason, int32_t regionNum)
6969
{
7070
TR::Compilation *comp = TR::comp();
7171

‎compiler/optimizer/OMRValuePropagation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4989,7 +4989,7 @@ void OMR::ValuePropagation::setUnreachablePath(TR::CFGEdge *edge)
49894989
void OMR::ValuePropagation::printStructureInfo(TR_Structure *s, bool starting, bool lastTimeThrough)
49904990
{
49914991
traceMsg(comp(), "\n%s ", starting ? "Starting " : "Stopping ");
4992-
char *type;
4992+
const char *type;
49934993
bool isLoop = false;
49944994
if (s->asRegion())
49954995
{

‎compiler/optimizer/OrderBlocks.cpp

+17-17
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ void TR_OrderBlocks::addRemainingSuccessorsToListHWProfile(TR::CFGNode *block, T
10021002
// pattern: block has goto to fall-through block
10031003
// block assumed to end in a goto
10041004
// returns TRUE if the pattern was found and replaced
1005-
bool TR_OrderBlocks::peepHoleGotoToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, char *title)
1005+
bool TR_OrderBlocks::peepHoleGotoToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, const char *title)
10061006
{
10071007
// pattern: block has goto to fall-through block
10081008
TR::Node *gotoNode = block->getLastRealTreeTop()->getNode();
@@ -1024,7 +1024,7 @@ bool TR_OrderBlocks::peepHoleGotoToFollowing(TR::CFG *cfg, TR::Block *block, TR:
10241024
// pattern: block contains goto to a block that only contains a goto
10251025
// block assumed to end in a goto
10261026
// returns TRUE if the pattern was found and replaced
1027-
bool TR_OrderBlocks::peepHoleGotoToGoto(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, char *title,
1027+
bool TR_OrderBlocks::peepHoleGotoToGoto(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, const char *title,
10281028
TR::BitVector &skippedGotoBlocks)
10291029
{
10301030
if (comp()->getProfilingMode() == JitProfiling)
@@ -1066,7 +1066,7 @@ bool TR_OrderBlocks::peepHoleGotoToGoto(TR::CFG *cfg, TR::Block *block, TR::Node
10661066
// pattern: block contains a goto to an empty block
10671067
// block assumed to end in a goto
10681068
// returns TRUE if the pattern was found and replaced
1069-
bool TR_OrderBlocks::peepHoleGotoToEmpty(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, char *title)
1069+
bool TR_OrderBlocks::peepHoleGotoToEmpty(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, const char *title)
10701070
{
10711071
if (comp()->getProfilingMode() == JitProfiling)
10721072
return false;
@@ -1098,7 +1098,7 @@ bool TR_OrderBlocks::peepHoleGotoToEmpty(TR::CFG *cfg, TR::Block *block, TR::Nod
10981098
return false;
10991099
}
11001100

1101-
static bool peepHoleGotoToLoopHeader(TR::CFG *cfg, TR::Block *block, TR::Block *dest, char *title)
1101+
static bool peepHoleGotoToLoopHeader(TR::CFG *cfg, TR::Block *block, TR::Block *dest, const char *title)
11021102
{
11031103
// try to peephole the following:
11041104
// dest: loopHeader
@@ -1162,7 +1162,7 @@ static bool peepHoleGotoToLoopHeader(TR::CFG *cfg, TR::Block *block, TR::Block *
11621162
// assume block->endsInGoto()
11631163
// returns TRUE if block was removed
11641164
// currently always returns false because this code can't remove block itself
1165-
void TR_OrderBlocks::peepHoleGotoBlock(TR::CFG *cfg, TR::Block *block, char *title)
1165+
void TR_OrderBlocks::peepHoleGotoBlock(TR::CFG *cfg, TR::Block *block, const char *title)
11661166
{
11671167
TR_ASSERT(block->endsInGoto(), "peepHoleGotoBlock called on block that doesn't end in a goto!");
11681168
bool madeAChange;
@@ -1215,7 +1215,7 @@ void TR_OrderBlocks::removeRedundantBranch(TR::CFG *cfg, TR::Block *block, TR::N
12151215
}
12161216

12171217

1218-
bool TR_OrderBlocks::peepHoleBranchToLoopHeader(TR::CFG *cfg, TR::Block *block, TR::Block *fallThrough, TR::Block *dest, char *title)
1218+
bool TR_OrderBlocks::peepHoleBranchToLoopHeader(TR::CFG *cfg, TR::Block *block, TR::Block *fallThrough, TR::Block *dest, const char *title)
12191219
{
12201220
bool success = false;
12211221
TR_Structure *destStructure = dest->getStructureOf();
@@ -1254,9 +1254,9 @@ bool TR_OrderBlocks::peepHoleBranchToLoopHeader(TR::CFG *cfg, TR::Block *block,
12541254
}
12551255

12561256
// apply peephole optimizations to blocks that end in a branch and branch around a single goto
1257-
void TR_OrderBlocks::peepHoleBranchAroundSingleGoto(TR::CFG *cfg, TR::Block *block, char *title)
1257+
void TR_OrderBlocks::peepHoleBranchAroundSingleGoto(TR::CFG *cfg, TR::Block *block, const char *title)
12581258
{
1259-
TR_ASSERT(block->endsInBranch(), "peepHoleBranchBlock called on block that doesn't end in a branch!");
1259+
TR_ASSERT(block->endsInBranch(), "peepHoleBranchAroundSingleGoto called on block that doesn't end in a branch!");
12601260
TR::Node *branchNode = block->getLastRealTreeTop()->getNode();
12611261
TR::TreeTop *takenEntry = branchNode->getBranchDestination();
12621262
TR::Block *takenBlock = takenEntry->getNode()->getBlock();
@@ -1328,7 +1328,7 @@ void TR_OrderBlocks::peepHoleBranchAroundSingleGoto(TR::CFG *cfg, TR::Block *blo
13281328
// apply peephole optimizations to blocks that end in a branch
13291329
// no looping here because there are only two possible optimizations done but we know which order to try them in
13301330
// assume block->endsInBranch()
1331-
void TR_OrderBlocks::peepHoleBranchBlock(TR::CFG *cfg, TR::Block *block, char *title)
1331+
void TR_OrderBlocks::peepHoleBranchBlock(TR::CFG *cfg, TR::Block *block, const char *title)
13321332
{
13331333
TR_ASSERT(block->endsInBranch(), "peepHoleBranchBlock called on block that doesn't end in a branch!");
13341334
TR::Node *branchNode = block->getLastRealTreeTop()->getNode();
@@ -1400,7 +1400,7 @@ void TR_OrderBlocks::peepHoleBranchBlock(TR::CFG *cfg, TR::Block *block, char *t
14001400
}
14011401

14021402
// look for a branch with taken block same as fall-through block
1403-
bool TR_OrderBlocks::peepHoleBranchToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, char *title)
1403+
bool TR_OrderBlocks::peepHoleBranchToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, const char *title)
14041404
{
14051405
TR_ASSERT(block->endsInBranch(), "peepHoleBranchToFollowing called on block that doesn't end in a branch!");
14061406
TR::Node *branchNode = block->getLastRealTreeTop()->getNode();
@@ -1419,7 +1419,7 @@ bool TR_OrderBlocks::peepHoleBranchToFollowing(TR::CFG *cfg, TR::Block *block, T
14191419
return false;
14201420
}
14211421

1422-
void TR_OrderBlocks::removeEmptyBlock(TR::CFG *cfg, TR::Block *block, char *title)
1422+
void TR_OrderBlocks::removeEmptyBlock(TR::CFG *cfg, TR::Block *block, const char *title)
14231423
{
14241424
TR_ASSERT(block->getExceptionPredecessors().empty(), "removeEmpty block doesn't deal with empty catch blocks properly");
14251425

@@ -1487,7 +1487,7 @@ void TR_OrderBlocks::removeEmptyBlock(TR::CFG *cfg, TR::Block *block, char *titl
14871487
// apply a small set of transformations to try to clean up blocks before ordering
14881488
// repeatedly apply these transformations until none apply
14891489
// returns TRUE if block still exists after peepholing
1490-
bool TR_OrderBlocks::doPeepHoleBlockCorrections(TR::Block *block, char *title)
1490+
bool TR_OrderBlocks::doPeepHoleBlockCorrections(TR::Block *block, const char *title)
14911491
{
14921492
TR::CFG *cfg = comp()->getFlowGraph();
14931493

@@ -1557,7 +1557,7 @@ bool TR_OrderBlocks::doPeepHoleBlockCorrections(TR::Block *block, char *title)
15571557

15581558
// go through the blocks looking for peephole optimization opportunities
15591559
// return TRUE if blocks were removed during the analysis
1560-
bool TR_OrderBlocks::lookForPeepHoleOpportunities(char *title)
1560+
bool TR_OrderBlocks::lookForPeepHoleOpportunities(const char *title)
15611561
{
15621562
static bool doPeepHoling=(feGetEnv("TR_noBlockOrderPeepholing") == NULL);
15631563
if (!doPeepHoling)
@@ -1586,7 +1586,7 @@ bool TR_OrderBlocks::lookForPeepHoleOpportunities(char *title)
15861586
TR::TreeTop *nextBlockTT = block->getExit()->getNextTreeTop();
15871587
if (trace()) traceMsg(comp(), "\tBlock %d:\n", block->getNumber());
15881588

1589-
bool blockStillExists = doPeepHoleBlockCorrections(block,title);
1589+
bool blockStillExists = doPeepHoleBlockCorrections(block, title);
15901590
tt = nextBlockTT;
15911591
if (!blockStillExists)
15921592
blocksWereRemoved = true;
@@ -2198,7 +2198,7 @@ void checkOrderingConsistency(TR::Compilation *comp)
21982198
{
21992199
if (seenColdBlock)
22002200
{
2201-
char *fmt= "Non-cold block_%d found after a cold block in method %s\n";
2201+
const char *fmt = "Non-cold block_%d found after a cold block in method %s\n";
22022202
char *buffer = (char *) comp->trMemory()->allocateStackMemory((strlen(fmt) + strlen(comp->signature()) + 15) * sizeof(char));
22032203
sprintf(buffer, fmt, block->getNumber(), comp->signature());
22042204
//TR_ASSERT(0, buffer);
@@ -2248,7 +2248,7 @@ void checkOrderingConsistency(TR::Compilation *comp)
22482248
}
22492249

22502250

2251-
void TR_BlockOrderingOptimization::dumpBlockOrdering(TR::TreeTop *tt, char *title)
2251+
void TR_BlockOrderingOptimization::dumpBlockOrdering(TR::TreeTop *tt, const char *title)
22522252
{
22532253
traceMsg(comp(), "%s:\n", title? title : "Block ordering");
22542254
unsigned numberOfColdBlocks = 0;
@@ -2289,7 +2289,7 @@ void TR_BlockShuffling::traceBlocks(TR::Block **blocks)
22892289
const int32_t BLOCKS_PER_LINE=30;
22902290
if (trace())
22912291
{
2292-
char *sep = "";
2292+
const char *sep = "";
22932293
for (int32_t i = 0; i < _numBlocks; i++)
22942294
{
22952295
traceMsg(comp(), "%s%d", sep, blocks[i]->getNumber());

‎compiler/optimizer/OrderBlocks.hpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class TR_BlockOrderingOptimization : public TR::Optimization
4747
{
4848
public:
4949

50-
void dumpBlockOrdering(TR::TreeTop *tt, char *title=NULL); // This is called from other opts!
50+
void dumpBlockOrdering(TR::TreeTop *tt, const char *title=NULL); // This is called from other opts!
5151

5252
protected:
5353
TR_BlockOrderingOptimization(TR::OptimizationManager *manager)
@@ -93,7 +93,7 @@ class TR_OrderBlocks : public TR_BlockOrderingOptimization
9393
void dontReorderBlocks() { _reorderBlocks = false; }
9494
void extendBlocks() { _extendBlocks = true; }
9595
void dontExtendBlocks() { _extendBlocks = false; }
96-
bool lookForPeepHoleOpportunities(char *title);
96+
bool lookForPeepHoleOpportunities(const char *title);
9797
void doReordering();
9898

9999
void invalidateStructure() { _needInvalidateStructure = true; }
@@ -114,17 +114,17 @@ class TR_OrderBlocks : public TR_BlockOrderingOptimization
114114
void removeFromOrderedBlockLists(TR::CFGNode *block);
115115
void addRemainingSuccessorsToList(TR::CFGNode *block, TR::CFGNode *excludeBlock);
116116

117-
bool peepHoleGotoToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, char *title);
118-
bool peepHoleGotoToGoto(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, char *title, TR::BitVector &skippedGotoBlocks);
119-
bool peepHoleGotoToEmpty(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, char *title);
120-
void peepHoleGotoBlock(TR::CFG *cfg, TR::Block *block, char *title);
117+
bool peepHoleGotoToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, const char *title);
118+
bool peepHoleGotoToGoto(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, const char *title, TR::BitVector &skippedGotoBlocks);
119+
bool peepHoleGotoToEmpty(TR::CFG *cfg, TR::Block *block, TR::Node *gotoNode, TR::Block *destOfGoto, const char *title);
120+
void peepHoleGotoBlock(TR::CFG *cfg, TR::Block *block, const char *title);
121121
void removeRedundantBranch(TR::CFG *cfg, TR::Block *block, TR::Node *branchNode, TR::Block *takenBlock);
122-
void peepHoleBranchBlock(TR::CFG *cfg, TR::Block *block, char *title);
123-
void peepHoleBranchAroundSingleGoto(TR::CFG *cfg, TR::Block *block, char *title);
124-
bool peepHoleBranchToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, char *title);
125-
bool peepHoleBranchToLoopHeader(TR::CFG *cfg, TR::Block *block, TR::Block *fallThrough, TR::Block *dest, char *title);
126-
void removeEmptyBlock(TR::CFG *cfg, TR::Block *block, char *title);
127-
bool doPeepHoleBlockCorrections(TR::Block *block, char *title);
122+
void peepHoleBranchBlock(TR::CFG *cfg, TR::Block *block, const char *title);
123+
void peepHoleBranchAroundSingleGoto(TR::CFG *cfg, TR::Block *block, const char *title);
124+
bool peepHoleBranchToFollowing(TR::CFG *cfg, TR::Block *block, TR::Block *followingBlock, const char *title);
125+
bool peepHoleBranchToLoopHeader(TR::CFG *cfg, TR::Block *block, TR::Block *fallThrough, TR::Block *dest, const char *title);
126+
void removeEmptyBlock(TR::CFG *cfg, TR::Block *block, const char *title);
127+
bool doPeepHoleBlockCorrections(TR::Block *block, const char *title);
128128
void addRemainingSuccessorsToListHWProfile(TR::CFGNode *block, TR::CFGNode *excludeBlock);
129129
void insertBlocksToList();
130130
bool hasValidCandidate(List<TR::CFGNode> & list, TR::CFGNode *prevBlock);

‎compiler/optimizer/ValuePropagationCommon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ void OMR::ValuePropagation::transformArrayCopyCall(TR::Node *node)
10931093
!comp()->getOption(TR_DisableMultiLeafArrayCopy))
10941094
{
10951095
TR_ResolvedMethod *caller = node->getSymbolReference()->getOwningMethod(comp());
1096-
char *sig = "multiLeafArrayCopy";
1096+
const char *sig = "multiLeafArrayCopy";
10971097
if (caller && strncmp(caller->nameChars(), sig, strlen(sig)) == 0)
10981098
{
10991099
if (trace())

0 commit comments

Comments
 (0)