diff --git a/runtime/compiler/p/codegen/CallSnippet.cpp b/runtime/compiler/p/codegen/CallSnippet.cpp index bfb09780b10..4489867a711 100644 --- a/runtime/compiler/p/codegen/CallSnippet.cpp +++ b/runtime/compiler/p/codegen/CallSnippet.cpp @@ -1181,7 +1181,7 @@ TR_MHJ2IThunk *TR::PPCCallSnippet::generateInvokeExactJ2IThunk(TR::Node *callNod uint8_t * TR_Debug::printPPCArgumentsFlush(TR::FILE *pOutFile, TR::Node *node, uint8_t *cursor, int32_t argSize) { - char *storeGPROpName; + const char *storeGPROpName; int32_t offset = 0, intArgNum = 0, floatArgNum = 0; @@ -1427,8 +1427,8 @@ TR_Debug::print(TR::FILE *pOutFile, TR::PPCCallSnippet * snippet) cursor = printPPCArgumentsFlush(pOutFile, callNode, cursor, snippet->getSizeOfArguments()); - char *info = ""; - int32_t distance; + const char *info = ""; + int32_t distance; if (isBranchToTrampoline(glueRef, cursor, distance)) info = " Through trampoline"; @@ -1526,8 +1526,8 @@ TR_Debug::print(TR::FILE *pOutFile, TR::PPCVirtualUnresolvedSnippet * snippet) printSnippetLabel(pOutFile, snippet->getSnippetLabel(), cursor, "Virtual Unresolved Call Snippet"); - char *info = ""; - int32_t distance; + const char *info = ""; + int32_t distance; if (isBranchToTrampoline(_cg->getSymRef(TR_PPCvirtualUnresolvedHelper), cursor, distance)) info = " Through trampoline"; @@ -1575,8 +1575,8 @@ TR_Debug::print(TR::FILE *pOutFile, TR::PPCInterfaceCallSnippet * snippet) printSnippetLabel(pOutFile, snippet->getSnippetLabel(), cursor, "Interface Call Snippet"); - char *info = ""; - int32_t distance; + const char *info = ""; + int32_t distance; if (isBranchToTrampoline(_cg->getSymRef(TR_PPCinterfaceCallHelper), cursor, distance)) info = " Through trampoline"; diff --git a/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp b/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp index e86afe2cc06..f459fbdd6ab 100644 --- a/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp +++ b/runtime/compiler/p/codegen/ForceRecompilationSnippet.cpp @@ -236,7 +236,7 @@ TR_Debug::print(TR::FILE *pOutFile, TR::PPCForceRecompilationSnippet * snippet) cursor += 4; } - char *info = ""; + const char *info = ""; if (isBranchToTrampoline(_cg->getSymRef(TR_PPCinduceRecompilation), cursor, value)) info = " Through trampoline"; diff --git a/runtime/compiler/p/codegen/J9TreeEvaluator.cpp b/runtime/compiler/p/codegen/J9TreeEvaluator.cpp index d5be46232e9..c1019546c40 100644 --- a/runtime/compiler/p/codegen/J9TreeEvaluator.cpp +++ b/runtime/compiler/p/codegen/J9TreeEvaluator.cpp @@ -8816,7 +8816,7 @@ static TR::Register *inlineAtomicOps(TR::Node *node, TR::CodeGenerator *cg, int8 if (!isArray) { TR_OpaqueClassBlock * bdClass; - char *className, *fieldSig; + const char *className, *fieldSig; int32_t classNameLen, fieldSigLen; fieldSigLen = 1; @@ -8878,7 +8878,7 @@ static TR::Register *inlineAtomicOps(TR::Node *node, TR::CodeGenerator *cg, int8 shiftAmount = 3; TR_OpaqueClassBlock * bdClass; - char *className, *fieldSig; + const char *className, *fieldSig; int32_t classNameLen, fieldSigLen; fieldSigLen = 1; @@ -9379,7 +9379,7 @@ static TR::Register *inlineAtomicOperation(TR::Node *node, TR::CodeGenerator *cg else if (!isArray) { TR_OpaqueClassBlock *classBlock; - char *className, *fieldSig; + const char *className, *fieldSig; int32_t classNameLen, fieldSigLen; fieldSigLen = 1; @@ -9432,7 +9432,7 @@ static TR::Register *inlineAtomicOperation(TR::Node *node, TR::CodeGenerator *cg fieldOffset = TR::Compiler->om.contiguousArrayHeaderSizeInBytes(); TR_OpaqueClassBlock *classBlock; - char *className, *fieldSig; + const char *className, *fieldSig; int32_t classNameLen, fieldSigLen; fieldSigLen = 1; diff --git a/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp b/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp index 686145ab92a..4c26f8c1bc1 100644 --- a/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp +++ b/runtime/compiler/p/codegen/J9UnresolvedDataSnippet.cpp @@ -316,8 +316,8 @@ TR_Debug::print(TR::FILE *pOutFile, TR::UnresolvedDataSnippet * snippet) glueRef = _cg->getSymRef(TR_PPCinterpreterUnresolvedStaticDataGlue); } - char *info = ""; - int32_t distance; + const char *info = ""; + int32_t distance; if (isBranchToTrampoline(glueRef, cursor, distance)) info = " Through Trampoline"; diff --git a/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp b/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp index dc4603f313f..5889a634d3a 100644 --- a/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp +++ b/runtime/compiler/p/codegen/PPCRecompilationSnippet.cpp @@ -93,8 +93,8 @@ TR_Debug::print(TR::FILE *pOutFile, TR::PPCRecompilationSnippet * snippet) printSnippetLabel(pOutFile, snippet->getSnippetLabel(), cursor, "Counting Recompilation Snippet"); - char *info = ""; - int32_t distance; + const char *info = ""; + int32_t distance; if (isBranchToTrampoline(_cg->getSymRef(TR_PPCcountingRecompileMethod), cursor, distance)) info = " Through trampoline"; diff --git a/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp b/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp index fcd5a93dbfc..f1806ce4aec 100644 --- a/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp +++ b/runtime/compiler/p/codegen/StackCheckFailureSnippet.cpp @@ -353,8 +353,8 @@ TR_Debug::print(TR::FILE *pOutFile, TR::PPCStackCheckFailureSnippet * snippet) cursor += 4; } - char *info = ""; - int32_t distance; + const char *info = ""; + int32_t distance; if (isBranchToTrampoline(_comp->getSymRefTab()->element(TR_stackOverflow), cursor, distance)) info = " Through trampoline"; diff --git a/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp b/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp index e36d47bce86..54d52bc0e76 100644 --- a/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp +++ b/runtime/compiler/p/runtime/PPCHWProfilerAIX.cpp @@ -67,7 +67,7 @@ struct pmapiInterface int (*pm_delete_program_mythread)(); int (*pm_start_mythread)(); int (*pm_stop_mythread)(); - char* (*pm_strerror)(char *where, int error); + char* (*pm_strerror)(const char *where, int error); int (*pm_get_data_mythread)(pm_data_t *data); // Private, not declared in pmapi.h int (*pm_set_ebb_handler)(void *handler_address, void *data_area); @@ -107,7 +107,7 @@ static bool pmapiInit() goto fail; } - char *curSym; + const char *curSym; curSym = "pm_initialize"; pmapi.pm_initialize = (int (*)(int, pm_info2_t *, pm_groups_info_t *, int))dlsym(pmapi.dlHandle, curSym); if (!pmapi.pm_initialize) @@ -149,7 +149,7 @@ static bool pmapiInit() if (!pmapi.pm_disable_bhrb) goto pmapiClose; curSym = "pm_strerror"; - pmapi.pm_strerror = (char* (*)(char *, int))dlsym(pmapi.dlHandle, curSym); + pmapi.pm_strerror = (char* (*)(const char *, int))dlsym(pmapi.dlHandle, curSym); if (!pmapi.pm_strerror) goto pmapiClose; curSym = "pm_get_data_mythread";