Skip to content

Commit 5ace1d3

Browse files
dylanjtuttledylanjtuttle
committed
Add 'const' qualifier to some string parameters
Fix a warning about string literals being assigned to non-const char pointers in getInstanceFieldOffset related functions, TR_AddressSet::traceDetails, and J9::Monitor::create by adding a 'const' qualifier to their string parameters Signed-off-by: Dylan Tuttle <[email protected]>
1 parent aa5cf33 commit 5ace1d3

13 files changed

+38
-38
lines changed

‎runtime/compiler/control/JITClientCompilationThread.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -766,8 +766,8 @@ handleServerMessage(JITServer::ClientStream *client, TR_J9VM *fe, JITServer::Mes
766766
auto &field = std::get<1>(recv);
767767
auto &sig = std::get<2>(recv);
768768
uintptr_t options = std::get<3>(recv);
769-
client->write(response, fe->getInstanceFieldOffset(clazz, const_cast<char *>(field.data()), field.length(),
770-
const_cast<char *>(sig.data()), sig.length(), options));
769+
client->write(response, fe->getInstanceFieldOffset(clazz, field.data(), field.length(),
770+
sig.data(), sig.length(), options));
771771
}
772772
break;
773773
case MessageType::VM_getJavaLangClassHashCode:

‎runtime/compiler/env/VMJ9.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6564,7 +6564,7 @@ TR_J9VMBase::getNumInnerClasses(TR_OpaqueClassBlock * classPointer)
65646564

65656565

65666566
uint32_t
6567-
TR_J9VMBase::getInstanceFieldOffsetIncludingHeader(char* classSignature, char * fieldName, char * fieldSig,
6567+
TR_J9VMBase::getInstanceFieldOffsetIncludingHeader(const char* classSignature, const char * fieldName, const char * fieldSig,
65686568
TR_ResolvedMethod* method)
65696569
{
65706570
TR_OpaqueClassBlock *classBlock=getClassFromSignature(classSignature, strlen(classSignature), method, true);
@@ -6579,8 +6579,8 @@ TR_J9VMBase::getProfiledClassFromProfiledInfo(TR_ExtraAddressInfo *profiledInfo)
65796579
}
65806580

65816581
uint32_t
6582-
TR_J9VMBase::getInstanceFieldOffset(TR_OpaqueClassBlock * clazz, char * fieldName, uint32_t fieldLen,
6583-
char * sig, uint32_t sigLen, UDATA options)
6582+
TR_J9VMBase::getInstanceFieldOffset(TR_OpaqueClassBlock * clazz, const char * fieldName, uint32_t fieldLen,
6583+
const char * sig, uint32_t sigLen, UDATA options)
65846584
{
65856585
TR::VMAccessCriticalSection getInstanceFieldOffset(this);
65866586
TR_ASSERT(clazz, "clazz should be set!");
@@ -6593,8 +6593,8 @@ TR_J9VMBase::getInstanceFieldOffset(TR_OpaqueClassBlock * clazz, char * fieldNam
65936593
}
65946594

65956595
uint32_t
6596-
TR_J9VMBase::getInstanceFieldOffset(TR_OpaqueClassBlock * clazz, char * fieldName, uint32_t fieldLen,
6597-
char * sig, uint32_t sigLen)
6596+
TR_J9VMBase::getInstanceFieldOffset(TR_OpaqueClassBlock * clazz, const char * fieldName, uint32_t fieldLen,
6597+
const char * sig, uint32_t sigLen)
65986598
{
65996599
return getInstanceFieldOffset(clazz, fieldName, fieldLen, sig, sigLen, J9_LOOK_NO_JAVA);
66006600
}
@@ -8535,8 +8535,8 @@ TR_J9SharedCacheVM::javaLangClassGetModifiersImpl(TR_OpaqueClassBlock * clazzPoi
85358535
}
85368536

85378537
uint32_t
8538-
TR_J9SharedCacheVM::getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName, uint32_t fieldLen,
8539-
char * sig, uint32_t sigLen, UDATA options)
8538+
TR_J9SharedCacheVM::getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName, uint32_t fieldLen,
8539+
const char * sig, uint32_t sigLen, UDATA options)
85408540
{
85418541

85428542
TR::Compilation* comp = _compInfoPT->getCompilation();

‎runtime/compiler/env/VMJ9.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -315,19 +315,19 @@ class TR_J9VMBase : public TR_FrontEnd
315315
bool fsdIsEnabled() { return _flags.testAny(FSDIsEnabled); }
316316
void setFSDIsEnabled(bool b) { _flags.set(FSDIsEnabled, b); }
317317

318-
uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName, char * sig)
318+
uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName, const char * sig)
319319
{
320320
return getInstanceFieldOffset(classPointer, fieldName, (uint32_t)strlen(fieldName), sig, (uint32_t)strlen(sig));
321321
}
322-
uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName, char * sig, uintptr_t options)
322+
uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName, const char * sig, uintptr_t options)
323323
{
324324
return getInstanceFieldOffset(classPointer, fieldName, (uint32_t)strlen(fieldName), sig, (uint32_t)strlen(sig), options);
325325
}
326326

327-
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName,
328-
uint32_t fieldLen, char * sig, uint32_t sigLen, UDATA options);
329-
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName,
330-
uint32_t fieldLen, char * sig, uint32_t sigLen);
327+
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName,
328+
uint32_t fieldLen, const char * sig, uint32_t sigLen, UDATA options);
329+
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName,
330+
uint32_t fieldLen, const char * sig, uint32_t sigLen);
331331

332332
// Not implemented
333333
virtual TR_ResolvedMethod * getObjectNewInstanceImplMethod(TR_Memory *) { return 0; }
@@ -610,24 +610,24 @@ class TR_J9VMBase : public TR_FrontEnd
610610
virtual uintptr_t getStaticReferenceFieldAtAddress(uintptr_t fieldAddress);
611611
virtual int32_t getInt32FieldAt(uintptr_t objectPointer, uintptr_t fieldOffset);
612612

613-
int32_t getInt32Field(uintptr_t objectPointer, char *fieldName)
613+
int32_t getInt32Field(uintptr_t objectPointer, const char *fieldName)
614614
{
615615
return getInt32FieldAt(objectPointer, getInstanceFieldOffset(getObjectClass(objectPointer), fieldName, "I"));
616616
}
617617

618-
int64_t getInt64Field(uintptr_t objectPointer, char *fieldName)
618+
int64_t getInt64Field(uintptr_t objectPointer, const char *fieldName)
619619
{
620620
return getInt64FieldAt(objectPointer, getInstanceFieldOffset(getObjectClass(objectPointer), fieldName, "J"));
621621
}
622622
virtual int64_t getInt64FieldAt(uintptr_t objectPointer, uintptr_t fieldOffset);
623623
virtual void setInt64FieldAt(uintptr_t objectPointer, uintptr_t fieldOffset, int64_t newValue);
624-
void setInt64Field(uintptr_t objectPointer, char *fieldName, int64_t newValue)
624+
void setInt64Field(uintptr_t objectPointer, const char *fieldName, int64_t newValue)
625625
{
626626
setInt64FieldAt(objectPointer, getInstanceFieldOffset(getObjectClass(objectPointer), fieldName, "J"), newValue);
627627
}
628628

629629
virtual bool compareAndSwapInt64FieldAt(uintptr_t objectPointer, uintptr_t fieldOffset, int64_t oldValue, int64_t newValue);
630-
bool compareAndSwapInt64Field(uintptr_t objectPointer, char *fieldName, int64_t oldValue, int64_t newValue)
630+
bool compareAndSwapInt64Field(uintptr_t objectPointer, const char *fieldName, int64_t oldValue, int64_t newValue)
631631
{
632632
return compareAndSwapInt64FieldAt(objectPointer, getInstanceFieldOffset(getObjectClass(objectPointer), fieldName, "J"), oldValue, newValue);
633633
}
@@ -1390,7 +1390,7 @@ class TR_J9VMBase : public TR_FrontEnd
13901390
virtual uintptr_t getLocalFragmentOffset();
13911391
virtual int32_t getLocalObjectAlignmentInBytes();
13921392

1393-
uint32_t getInstanceFieldOffsetIncludingHeader(char* classSignature, char * fieldName, char * fieldSig, TR_ResolvedMethod* method);
1393+
uint32_t getInstanceFieldOffsetIncludingHeader(const char* classSignature, const char * fieldName, const char * fieldSig, TR_ResolvedMethod* method);
13941394

13951395
virtual void markHotField( TR::Compilation *, TR::SymbolReference *, TR_OpaqueClassBlock *, bool);
13961396
virtual void reportHotField(int32_t reducedCpuUtil, J9Class* clazz, uint8_t fieldOffset, uint32_t reducedFrequency);
@@ -1583,8 +1583,8 @@ class TR_J9SharedCacheVM : public TR_J9VM
15831583
virtual TR_OpaqueClassBlock *getClassOfMethod(TR_OpaqueMethodBlock *method);
15841584
virtual void getResolvedMethods(TR_Memory *, TR_OpaqueClassBlock *, List<TR_ResolvedMethod> *);
15851585
virtual TR_ResolvedMethod *getResolvedMethodForNameAndSignature(TR_Memory * trMemory, TR_OpaqueClassBlock * classPointer, const char* methodName, const char *signature);
1586-
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName,
1587-
uint32_t fieldLen, char * sig, uint32_t sigLen, UDATA options);
1586+
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName,
1587+
uint32_t fieldLen, const char * sig, uint32_t sigLen, UDATA options);
15881588

15891589
virtual TR_OpaqueMethodBlock *getResolvedVirtualMethod(TR_OpaqueClassBlock * classObject, int32_t cpIndex, bool ignoreReResolve = true);
15901590
virtual TR_OpaqueMethodBlock *getResolvedInterfaceMethod(TR_OpaqueMethodBlock *ownerMethod, TR_OpaqueClassBlock * classObject, int32_t cpIndex);

‎runtime/compiler/env/VMJ9Server.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ TR_J9ServerVM::isUnloadAssumptionRequired(TR_OpaqueClassBlock *clazz, TR_Resolve
13851385
}
13861386

13871387
uint32_t
1388-
TR_J9ServerVM::getInstanceFieldOffset(TR_OpaqueClassBlock *clazz, char *fieldName, uint32_t fieldLen, char *sig, uint32_t sigLen, UDATA options)
1388+
TR_J9ServerVM::getInstanceFieldOffset(TR_OpaqueClassBlock *clazz, const char *fieldName, uint32_t fieldLen, const char *sig, uint32_t sigLen, UDATA options)
13891389
{
13901390
JITServer::ServerStream *stream = _compInfoPT->getMethodBeingCompiled()->_stream;
13911391
stream->write(JITServer::MessageType::VM_getInstanceFieldOffset, clazz, std::string(fieldName, fieldLen), std::string(sig, sigLen), options);
@@ -2865,8 +2865,8 @@ TR_J9SharedCacheServerVM::javaLangClassGetModifiersImpl(TR_OpaqueClassBlock * cl
28652865
}
28662866

28672867
uint32_t
2868-
TR_J9SharedCacheServerVM::getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName, uint32_t fieldLen,
2869-
char * sig, uint32_t sigLen, UDATA options)
2868+
TR_J9SharedCacheServerVM::getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName, uint32_t fieldLen,
2869+
const char * sig, uint32_t sigLen, UDATA options)
28702870
{
28712871
TR::Compilation* comp = _compInfoPT->getCompilation();
28722872
TR_ASSERT(comp, "Should be called only within a compilation");

‎runtime/compiler/env/VMJ9Server.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class TR_J9ServerVM: public TR_J9VM
152152
virtual bool isUnloadAssumptionRequired(TR_OpaqueClassBlock *, TR_ResolvedMethod *) override;
153153
virtual void *getJ2IThunk(char *signatureChars, uint32_t signatureLength, TR::Compilation *comp) override;
154154
virtual void *setJ2IThunk(char *signatureChars, uint32_t signatureLength, void *thunkptr, TR::Compilation *comp) override;
155-
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock *clazz, char *fieldName, uint32_t fieldLen, char *sig, uint32_t sigLen, UDATA options) override;
155+
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock *clazz, const char *fieldName, uint32_t fieldLen, const char *sig, uint32_t sigLen, UDATA options) override;
156156
virtual int32_t getJavaLangClassHashCode(TR::Compilation *comp, TR_OpaqueClassBlock *clazz, bool &hashCodeComputed) override;
157157
virtual bool hasFinalizer(TR_OpaqueClassBlock *clazz) override;
158158
virtual uintptr_t getClassDepthAndFlagsValue(TR_OpaqueClassBlock *clazz) override;
@@ -321,7 +321,7 @@ class TR_J9SharedCacheServerVM: public TR_J9ServerVM
321321
virtual bool methodsCanBeInlinedEvenIfEventHooksEnabled(TR::Compilation *comp) override;
322322
virtual int32_t getJavaLangClassHashCode(TR::Compilation * comp, TR_OpaqueClassBlock * clazzPointer, bool &hashCodeComputed) override;
323323
virtual bool javaLangClassGetModifiersImpl(TR_OpaqueClassBlock * clazzPointer, int32_t &result) override;
324-
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, char * fieldName, uint32_t fieldLen, char * sig, uint32_t sigLen, UDATA options) override;
324+
virtual uint32_t getInstanceFieldOffset(TR_OpaqueClassBlock * classPointer, const char * fieldName, uint32_t fieldLen, const char * sig, uint32_t sigLen, UDATA options) override;
325325
virtual TR_OpaqueClassBlock * getClassOfMethod(TR_OpaqueMethodBlock *method) override;
326326
virtual TR_OpaqueClassBlock * getSuperClass(TR_OpaqueClassBlock *classPointer) override;
327327
virtual void getResolvedMethods(TR_Memory *, TR_OpaqueClassBlock *, List<TR_ResolvedMethod> *) override;

‎runtime/compiler/infra/J9Monitor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
TR::MonitorTable *OMR::MonitorTable::_instance = 0;
3333

3434
TR::Monitor *
35-
J9::Monitor::create(char *name)
35+
J9::Monitor::create(const char *name)
3636
{
3737
return TR::MonitorTable::get()->create(name);
3838
}
@@ -44,7 +44,7 @@ J9::Monitor::destroy(TR::Monitor *monitor)
4444
}
4545

4646
bool
47-
J9::Monitor::init(char *name)
47+
J9::Monitor::init(const char *name)
4848
{
4949
setNext(0);
5050
if (j9thread_monitor_init_with_name((J9ThreadMonitor**)&_monitor, 0, name))

‎runtime/compiler/infra/J9Monitor.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Monitor : public TR_Link0<TR::Monitor>
4747
{
4848
public:
4949

50-
static TR::Monitor *create(char *name);
50+
static TR::Monitor *create(const char *name);
5151
static void destroy(TR::Monitor *monitor);
5252

5353
void enter();
@@ -81,7 +81,7 @@ class Monitor : public TR_Link0<TR::Monitor>
8181
void operator delete(void *p);
8282
void operator delete(void *p, void *) {}
8383

84-
bool init(char *name);
84+
bool init(const char *name);
8585

8686
bool initFromVMMutex(void *mutex);
8787

‎runtime/compiler/infra/J9MonitorTable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ J9::MonitorTable::allocInitClassUnloadMonitorHolders(uint32_t allowedTotalCompTh
9191
}
9292

9393
TR::Monitor *
94-
J9::MonitorTable::create(char *name)
94+
J9::MonitorTable::create(const char *name)
9595
{
9696
PORT_ACCESS_FROM_PORT(_portLib);
9797

‎runtime/compiler/infra/J9MonitorTable.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class OMR_EXTENSIBLE MonitorTable : public OMR::MonitorTableConnector
7373
friend class J9::RWMonitor;
7474
friend class TR::MonitorTable;
7575

76-
TR::Monitor *create(char *name);
76+
TR::Monitor *create(const char *name);
7777
void insert(TR::Monitor *monitor);
7878

7979
J9PortLibrary *_portLib;

‎runtime/compiler/infra/RWMonitor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ J9::RWMonitor::destroy()
6262

6363

6464
bool
65-
J9::RWMonitor::init(char *name)
65+
J9::RWMonitor::init(const char *name)
6666
{
6767
return j9thread_rwmutex_init(&_monitor, 0, name) == 0 ? true : false;
6868
}
@@ -113,7 +113,7 @@ J9::RWMonitor::destroy()
113113

114114

115115
bool
116-
J9::RWMonitor::init(char *name)
116+
J9::RWMonitor::init(const char *name)
117117
{
118118
return j9thread_monitor_init_with_name((J9ThreadMonitor**)&_monitor, 0, name) == 0 ? true : false;
119119
}

‎runtime/compiler/infra/RWMonitor.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class RWMonitor
4949
private:
5050

5151
friend class J9::MonitorTable;
52-
bool init(char *name);
52+
bool init(const char *name);
5353
bool initFromVMMutex(void *mutex);
5454

5555
#ifdef J9VM_JIT_CLASS_UNLOAD_RWMONITOR

‎runtime/compiler/runtime/ClassUnloadAssumption.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@ void TR_AddressSet::trace(char *format, ...)
13811381
}
13821382
}
13831383

1384-
void TR_AddressSet::traceDetails(char *format, ...)
1384+
void TR_AddressSet::traceDetails(const char *format, ...)
13851385
{
13861386
if (enableTraceDetails())
13871387
{

‎runtime/compiler/runtime/RuntimeAssumptions.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class TR_AddressSet
224224

225225
static void trace(char *format, ...);
226226
static bool enableTraceDetails();
227-
static void traceDetails(char *format, ...);
227+
static void traceDetails(const char *format, ...);
228228

229229
void moveAddressRanges(int32_t desiredHole, int32_t currentHole);
230230
void moveAddressRangesBy(int32_t low, int32_t high, int32_t distance);

0 commit comments

Comments
 (0)