Skip to content

Commit a4c2021

Browse files
hzongarohzongaro
authored
Merge pull request #7185 from dylanjtuttle/constCharAnyTime
Fix string literal conversion warnings in codegen, p, il, infra, optimizer
2 parents f2ac55a + 4ea4731 commit a4c2021

17 files changed

+68
-68
lines changed

‎compiler/codegen/CodeGenRA.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2829,7 +2829,7 @@ OMR::CodeGenerator::simulateNodeEvaluation(TR::Node *node, TR_RegisterPressureSt
28292829
// don't properly account for cases where one child's result must live
28302830
// across the evaluation of another child.
28312831
//
2832-
char *tag = NULL;
2832+
const char *tag = NULL;
28332833
if ( nodeGotFoldedIntoMemref(node, state, self())
28342834
&& self()->simulatedNodeState(node)._willBeRematerialized == 0 // remat nodes have already had their children incremented, so we must decrement them
28352835
){

‎compiler/codegen/OMRCodeGenerator.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1192,21 +1192,21 @@ class OMR_EXTENSIBLE CodeGenerator
11921192
uint8_t *target,
11931193
uint8_t *target2,
11941194
TR_ExternalRelocationTargetKind kind,
1195-
char *generatingFileName,
1195+
const char *generatingFileName,
11961196
uintptr_t generatingLineNumber,
11971197
TR::Node *node) {}
11981198
void addProjectSpecializedPairRelocation(uint8_t *location1,
11991199
uint8_t *location2,
12001200
uint8_t *target,
12011201
TR_ExternalRelocationTargetKind kind,
1202-
char *generatingFileName,
1202+
const char *generatingFileName,
12031203
uintptr_t generatingLineNumber,
12041204
TR::Node *node) {}
12051205
void addProjectSpecializedRelocation(TR::Instruction *instr,
12061206
uint8_t *target,
12071207
uint8_t *target2,
12081208
TR_ExternalRelocationTargetKind kind,
1209-
char *generatingFileName,
1209+
const char *generatingFileName,
12101210
uintptr_t generatingLineNumber,
12111211
TR::Node *node) {}
12121212

‎compiler/codegen/Relocation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ uintptr_t TR::ExternalRelocation::_globalValueList[TR_NumGlobalValueItems] =
497497
0 // TR_HeapSizeForBarrierRange0
498498
};
499499

500-
char *TR::ExternalRelocation::_globalValueNames[TR_NumGlobalValueItems] =
500+
const char *TR::ExternalRelocation::_globalValueNames[TR_NumGlobalValueItems] =
501501
{
502502
"not used (0)",
503503
"TR_CountForRecompile (1)",

‎compiler/codegen/Relocation.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -424,17 +424,17 @@ class ExternalRelocation : public TR::Relocation
424424
virtual bool isExternalRelocation() { return true; }
425425

426426
static const char *getName(TR_ExternalRelocationTargetKind k) {return _externalRelocationTargetKindNames[k];}
427-
static uintptr_t getGlobalValue(uint32_t g)
427+
static uintptr_t getGlobalValue(uint32_t g)
428428
{
429429
TR_ASSERT(g >= 0 && g < TR_NumGlobalValueItems, "invalid index for global item");
430430
return _globalValueList[g];
431431
}
432-
static void setGlobalValue(uint32_t g, uintptr_t v)
432+
static void setGlobalValue(uint32_t g, uintptr_t v)
433433
{
434434
TR_ASSERT(g >= 0 && g < TR_NumGlobalValueItems, "invalid index for global item");
435435
_globalValueList[g] = v;
436436
}
437-
static char * nameOfGlobal(uint32_t g)
437+
static const char *nameOfGlobal(uint32_t g)
438438
{
439439
TR_ASSERT(g >= 0 && g < TR_NumGlobalValueItems, "invalid index for global item");
440440
return _globalValueNames[g];
@@ -443,12 +443,12 @@ class ExternalRelocation : public TR::Relocation
443443
private:
444444
uint8_t *_targetAddress;
445445
uint8_t *_targetAddress2;
446-
TR::IteratedExternalRelocation *_relocationRecord;
446+
TR::IteratedExternalRelocation *_relocationRecord;
447447
TR_ExternalRelocationTargetKind _kind;
448448
static const char *_externalRelocationTargetKindNames[TR_NumExternalRelocationKinds];
449449
static uintptr_t _globalValueList[TR_NumGlobalValueItems];
450450
static uint8_t _globalValueSizeList[TR_NumGlobalValueItems];
451-
static char *_globalValueNames[TR_NumGlobalValueItems];
451+
static const char *_globalValueNames[TR_NumGlobalValueItems];
452452
};
453453

454454
class ExternalOrderedPair32BitRelocation: public TR::ExternalRelocation

‎compiler/codegen/StorageInfo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "il/SymbolReference.hpp"
3636
#include "infra/Assert.hpp"
3737

38-
char *TR_StorageInfo::TR_StorageClassNames[TR_NumStorageClassTypes] =
38+
const char *TR_StorageInfo::TR_StorageClassNames[TR_NumStorageClassTypes] =
3939
{
4040
"<unknown_class>",
4141
"<direct_mapped_auto>",
@@ -44,7 +44,7 @@ char *TR_StorageInfo::TR_StorageClassNames[TR_NumStorageClassTypes] =
4444
"<private_static_base_address>",
4545
};
4646

47-
char *TR_StorageInfo::TR_StorageOverlapKindNames[TR_NumOverlapTypes] =
47+
const char *TR_StorageInfo::TR_StorageOverlapKindNames[TR_NumOverlapTypes] =
4848
{
4949
"NoOverlap",
5050
"MayOverlap",

‎compiler/codegen/StorageInfo.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ class TR_StorageInfo
8181

8282
void print();
8383

84-
char *getName() { return getName(_class); }
84+
const char *getName() { return getName(_class); }
8585

86-
static char *getName(TR_StorageClass klass)
86+
static const char *getName(TR_StorageClass klass)
8787
{ return ((klass < TR_NumStorageClassTypes) ? TR_StorageClassNames[klass] : (char*)"invalid_class"); }
8888

89-
static char *getName(TR_StorageOverlapKind overlapType)
89+
static const char *getName(TR_StorageOverlapKind overlapType)
9090
{ return ((overlapType < TR_NumOverlapTypes) ? TR_StorageOverlapKindNames[overlapType] : (char*)"invalid_overlap_type"); }
9191

9292
TR::Compilation *comp() { return _comp; }
@@ -100,8 +100,8 @@ class TR_StorageInfo
100100
size_t _length;
101101
TR_StorageClass _class;
102102
TR::Compilation * _comp;
103-
static char *TR_StorageClassNames[TR_NumStorageClassTypes];
104-
static char *TR_StorageOverlapKindNames[TR_NumOverlapTypes];
103+
static const char *TR_StorageClassNames[TR_NumStorageClassTypes];
104+
static const char *TR_StorageOverlapKindNames[TR_NumOverlapTypes];
105105

106106
};
107107

‎compiler/il/OMRBlock.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,9 @@ class OMR_EXTENSIBLE Block : public TR::CFGNode
502502

503503
struct StandardException
504504
{
505-
int32_t length;
506-
char *name;
507-
uint32_t exceptions;
505+
int32_t length;
506+
const char *name;
507+
uint32_t exceptions;
508508
};
509509

510510
static StandardException _standardExceptions[];

‎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
{

0 commit comments

Comments
 (0)