diff options
-rw-r--r-- | src/jit/gentree.cpp | 2 | ||||
-rw-r--r-- | src/jit/jiteh.cpp | 2 | ||||
-rw-r--r-- | src/jit/lsra.cpp | 10 | ||||
-rw-r--r-- | src/jit/lsra.h | 10 | ||||
-rw-r--r-- | src/jit/phase.h | 4 | ||||
-rw-r--r-- | src/jit/rangecheck.h | 2 | ||||
-rw-r--r-- | src/vm/exceptionhandling.cpp | 6 | ||||
-rw-r--r-- | src/vm/exceptionhandling.h | 2 | ||||
-rw-r--r-- | src/vm/threadsuspend.cpp | 4 | ||||
-rw-r--r-- | src/vm/threadsuspend.h | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/src/jit/gentree.cpp b/src/jit/gentree.cpp index 64bb74745e..dac1ad0190 100644 --- a/src/jit/gentree.cpp +++ b/src/jit/gentree.cpp @@ -8454,7 +8454,7 @@ GenTreePtr Compiler::gtDispLinearTree(GenTreeStmt* curStmt, } unsigned listElemNum = 0; - char* childMsg = nullptr; + const char* childMsg = nullptr; if (tree->IsCall()) { if (child == tree->gtCall.gtCallObjp) diff --git a/src/jit/jiteh.cpp b/src/jit/jiteh.cpp index 0d8016d8a4..94555b92a3 100644 --- a/src/jit/jiteh.cpp +++ b/src/jit/jiteh.cpp @@ -2468,7 +2468,7 @@ bool Compiler::fgNormalizeEHCase3() EHblkDsc* ehOuter = ehGetDsc(ehOuterIndex); // Debugging: say what type of block we're updating. - INDEBUG(char* outerType = ""; char* innerType = "";) + INDEBUG(const char* outerType = ""; const char* innerType = "";) // 'insertAfterBlk' is the place we will insert new "normalization" blocks. We don't know yet if we will // insert them after the innermost 'try' or handler's "last" block, so we set it to nullptr. Once we determine diff --git a/src/jit/lsra.cpp b/src/jit/lsra.cpp index 778c644306..0db1ab0659 100644 --- a/src/jit/lsra.cpp +++ b/src/jit/lsra.cpp @@ -7426,7 +7426,7 @@ LinearScan::insertSwap(BasicBlock* block, #ifdef DEBUG if (VERBOSE) { - char * insertionPointString = "top"; + const char * insertionPointString = "top"; if (insertionPoint == nullptr) { insertionPointString = "bottom"; @@ -7595,7 +7595,7 @@ LinearScan::addResolution(BasicBlock* block, regNumber fromReg) { #ifdef DEBUG - char * insertionPointString = "top"; + const char * insertionPointString = "top"; #endif // DEBUG if (insertionPoint == nullptr) { @@ -8590,7 +8590,7 @@ LinearScan::lsraDumpIntervals(const char* msg) void LinearScan::lsraGetOperandString(GenTreePtr tree, LsraTupleDumpMode mode, char *operandString, unsigned operandStringLength) { - char* lastUseChar = ""; + const char* lastUseChar = ""; if ((tree->gtFlags & GTF_VAR_DEATH) != 0) lastUseChar = "*"; switch (mode) { @@ -8625,7 +8625,7 @@ LinearScan::lsraDispNode(GenTreePtr tree, LsraTupleDumpMode mode, bool hasDest) Compiler* compiler = GetTlsCompiler(); const unsigned operandStringLength = 16; char operandString[operandStringLength]; - char* emptyDestOperand = " "; + const char* emptyDestOperand = " "; char spillChar = ' '; if (mode == LinearScan::LSRA_DUMP_POST) @@ -8683,7 +8683,7 @@ LinearScan::lsraDispNode(GenTreePtr tree, LsraTupleDumpMode mode, bool hasDest) else if (tree->OperIsAssignment()) { assert(!tree->gtHasReg()); - char * isRev = ""; + const char * isRev = ""; if ((tree->gtFlags & GTF_REVERSE_OPS) != 0) isRev = "(Rev)"; printf(" asg%s%s ", GenTree::NodeName(tree->OperGet()), isRev); } diff --git a/src/jit/lsra.h b/src/jit/lsra.h index 295d202126..4119a216df 100644 --- a/src/jit/lsra.h +++ b/src/jit/lsra.h @@ -789,11 +789,11 @@ private: int regColumnWidth; int regTableIndent; - char* columnSeparator; - char* line; - char* leftBox; - char* middleBox; - char* rightBox; + const char* columnSeparator; + const char* line; + const char* leftBox; + const char* middleBox; + const char* rightBox; static const int MAX_FORMAT_CHARS = 12; char intervalNameFormat[MAX_FORMAT_CHARS]; diff --git a/src/jit/phase.h b/src/jit/phase.h index 2ba0dacfaf..ac074c85fe 100644 --- a/src/jit/phase.h +++ b/src/jit/phase.h @@ -11,7 +11,7 @@ class Phase { public: Phase(Compiler *_comp, - char *_name, + const char *_name, Phases _phase=PHASE_NUMBER_OF) : comp(_comp), name(_name), phase(_phase) {} virtual void Run(); @@ -21,7 +21,7 @@ public: protected: Compiler *comp; - char *name; + const char *name; Phases phase; }; diff --git a/src/jit/rangecheck.h b/src/jit/rangecheck.h index 5521a4669e..aa479e5f97 100644 --- a/src/jit/rangecheck.h +++ b/src/jit/rangecheck.h @@ -217,7 +217,7 @@ struct Limit return false; } #ifdef DEBUG - char* ToString(IAllocator* alloc) + const char* ToString(IAllocator* alloc) { unsigned size = 64; char* buf = (char*) alloc->Alloc(size); diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index 36dca5ee12..853e605dfe 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -71,7 +71,7 @@ // #ifdef _DEBUG void DumpClauses(IJitManager* pJitMan, const METHODTOKEN& MethToken, UINT_PTR uMethodStartPC, UINT_PTR dwControlPc); -static void DoEHLog(DWORD lvl, __in_z char *fmt, ...); +static void DoEHLog(DWORD lvl, __in_z const char *fmt, ...); #define EH_LOG(expr) { DoEHLog expr ; } #else #define EH_LOG(expr) @@ -1881,7 +1881,7 @@ lExit: } // static -void ExceptionTracker::DebugLogTrackerRanges(__in_z char *pszTag) +void ExceptionTracker::DebugLogTrackerRanges(__in_z const char *pszTag) { #ifdef _DEBUG CONTRACTL @@ -4186,7 +4186,7 @@ void DumpClauses(IJitManager* pJitMan, const METHODTOKEN& MethToken, UINT_PTR uM static void DoEHLog( DWORD lvl, - __in_z char *fmt, + __in_z const char *fmt, ... ) { diff --git a/src/vm/exceptionhandling.h b/src/vm/exceptionhandling.h index 639f47c5b4..5b2568aadc 100644 --- a/src/vm/exceptionhandling.h +++ b/src/vm/exceptionhandling.h @@ -366,7 +366,7 @@ public: void EnumMemoryRegions(CLRDataEnumMemoryFlags flags); #endif // DACCESS_COMPILE - static void DebugLogTrackerRanges(__in_z char *pszTag); + static void DebugLogTrackerRanges(__in_z const char *pszTag); bool IsStackOverflowException(); diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp index 98800f6e85..5c110d8114 100644 --- a/src/vm/threadsuspend.cpp +++ b/src/vm/threadsuspend.cpp @@ -1,4 +1,4 @@ -// + // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. // @@ -8480,7 +8480,7 @@ void SuspendStatistics::DisplayAndUpdate() const char* const str_timeUnit[] = { "usec", "msec", "sec" }; const int timeUnitFactor[] = { 1, 1000, 1000000 }; -void MinMaxTot::DisplayAndUpdate(FILE* logFile, __in_z char *pName, MinMaxTot *pLastOne, int fullCount, int priorCount, timeUnit unit /* = usec */) +void MinMaxTot::DisplayAndUpdate(FILE* logFile, __in_z const char *pName, MinMaxTot *pLastOne, int fullCount, int priorCount, timeUnit unit /* = usec */) { LIMITED_METHOD_CONTRACT; diff --git a/src/vm/threadsuspend.h b/src/vm/threadsuspend.h index 572584104c..73f2b8b803 100644 --- a/src/vm/threadsuspend.h +++ b/src/vm/threadsuspend.h @@ -38,7 +38,7 @@ struct MinMaxTot minVal = maxVal = 0; } - void DisplayAndUpdate(FILE* logFile, __in_z char *pName, MinMaxTot *pLastOne, int fullCount, int priorCount, timeUnit=usec); + void DisplayAndUpdate(FILE* logFile, __in_z const char *pName, MinMaxTot *pLastOne, int fullCount, int priorCount, timeUnit=usec); }; // A note about timings. We use QueryPerformanceCounter to measure all timings in units. During |