diff options
author | Sinan Kaya <sinan.kaya@microsoft.com> | 2019-03-07 02:25:21 +0000 |
---|---|---|
committer | Sinan Kaya <sinan.kaya@microsoft.com> | 2019-03-07 20:17:42 +0000 |
commit | 5a97d8e9f14763a4ff90d14d045f0173e8d4b944 (patch) | |
tree | cc365cbf3d7ed74e151af38bfc4dd315b780ae51 /src/ToolBox | |
parent | b1f7195e26d8e0eb310515fe44d02883375c9ec3 (diff) | |
download | coreclr-5a97d8e9f14763a4ff90d14d045f0173e8d4b944.tar.gz coreclr-5a97d8e9f14763a4ff90d14d045f0173e8d4b944.tar.bz2 coreclr-5a97d8e9f14763a4ff90d14d045f0173e8d4b944.zip |
Fix signed compare warnings
warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
conversions
Update src/ToolBox/superpmi/mcs/verbdumptoc.cpp
Co-Authored-By: franksinankaya <41809318+franksinankaya@users.noreply.github.com>
Diffstat (limited to 'src/ToolBox')
-rw-r--r-- | src/ToolBox/SOS/Strike/disasm.cpp | 2 | ||||
-rw-r--r-- | src/ToolBox/SOS/Strike/strike.cpp | 8 | ||||
-rw-r--r-- | src/ToolBox/SOS/Strike/util.cpp | 2 | ||||
-rw-r--r-- | src/ToolBox/superpmi/mcs/verbdumptoc.cpp | 2 | ||||
-rw-r--r-- | src/ToolBox/superpmi/superpmi-shared/compileresult.cpp | 2 | ||||
-rw-r--r-- | src/ToolBox/superpmi/superpmi-shared/lightweightmap.h | 2 | ||||
-rw-r--r-- | src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp | 4 | ||||
-rw-r--r-- | src/ToolBox/superpmi/superpmi-shared/tocfile.cpp | 2 | ||||
-rw-r--r-- | src/ToolBox/superpmi/superpmi/neardiffer.cpp | 8 |
9 files changed, 16 insertions, 16 deletions
diff --git a/src/ToolBox/SOS/Strike/disasm.cpp b/src/ToolBox/SOS/Strike/disasm.cpp index f82c38ac4d..ceb0fed30d 100644 --- a/src/ToolBox/SOS/Strike/disasm.cpp +++ b/src/ToolBox/SOS/Strike/disasm.cpp @@ -530,7 +530,7 @@ INT_PTR ParseHexNumber (__in_z char *ptr, ___out char **endptr) endptr1 = endptr2; } // if the hex number was specified as 000006fbf9b70f50, an overflow occurred - else if (ULONG_MAX == value1 && errno == ERANGE) + else if ((INT_PTR)ULONG_MAX == value1 && errno == ERANGE) { if (!strncmp(ptr, "0x", 2)) ptr += 2; diff --git a/src/ToolBox/SOS/Strike/strike.cpp b/src/ToolBox/SOS/Strike/strike.cpp index f85957ee14..b25d340771 100644 --- a/src/ToolBox/SOS/Strike/strike.cpp +++ b/src/ToolBox/SOS/Strike/strike.cpp @@ -2157,7 +2157,7 @@ DECLARE_API(DumpDelegate) DacpObjectData objData; if (objData.Request(g_sos, invocationList) == S_OK && objData.ObjectType == OBJ_ARRAY && - invocationCount <= objData.dwNumComponents) + invocationCount <= (int)objData.dwNumComponents) { for (int i = 0; i < invocationCount; i++) { @@ -2363,7 +2363,7 @@ Done: // Overload that mirrors the code above when the ExceptionObjectData was already retrieved from LS BOOL IsAsyncException(const DacpExceptionObjectData & excData) { - if (excData.XCode != EXCEPTION_COMPLUS) + if ((DWORD)excData.XCode != EXCEPTION_COMPLUS) return TRUE; HRESULT ehr = excData.HResult; @@ -4605,7 +4605,7 @@ DECLARE_API(DumpAsync) DacpObjectData objData; if (objData.Request(g_sos, TO_CDADDR(listItemsPtr)) == S_OK && objData.ObjectType == OBJ_ARRAY) { - for (int i = 0; i < objData.dwNumComponents; i++) + for (SIZE_T i = 0; i < objData.dwNumComponents; i++) { CLRDATA_ADDRESS elementPtr; MOVE(elementPtr, TO_CDADDR(objData.ArrayDataPtr + (i * objData.dwComponentSize))); @@ -15544,7 +15544,7 @@ GetStackFrame(CONTEXT* context, ULONG numNativeFrames) if (FAILED(hr)) { PDEBUG_STACK_FRAME frame = &g_Frames[0]; - for (int i = 0; i < numNativeFrames; i++, frame++) { + for (unsigned int i = 0; i < numNativeFrames; i++, frame++) { if (frame->InstructionOffset == context->Rip) { if ((i + 1) >= numNativeFrames) { diff --git a/src/ToolBox/SOS/Strike/util.cpp b/src/ToolBox/SOS/Strike/util.cpp index 7098cc8019..0a286d2e6f 100644 --- a/src/ToolBox/SOS/Strike/util.cpp +++ b/src/ToolBox/SOS/Strike/util.cpp @@ -1726,7 +1726,7 @@ int GetValueFieldOffset(CLRDATA_ADDRESS cdaMT, __in_z LPCWSTR wszFieldName, Dacp if (dmtd.ParentMethodTable) { DWORD retVal = GetValueFieldOffset(dmtd.ParentMethodTable, wszFieldName, pDacpFieldDescData); - if (retVal != NOT_FOUND) + if (retVal != (DWORD)NOT_FOUND) { // Return in case of error or success. Fall through for field-not-found. return retVal; diff --git a/src/ToolBox/superpmi/mcs/verbdumptoc.cpp b/src/ToolBox/superpmi/mcs/verbdumptoc.cpp index f9cc69effa..a2366225c2 100644 --- a/src/ToolBox/superpmi/mcs/verbdumptoc.cpp +++ b/src/ToolBox/superpmi/mcs/verbdumptoc.cpp @@ -20,7 +20,7 @@ int verbDumpToc::DoWork(const char* nameOfInput) const TOCElement* te = tf.GetElementPtr(i); printf("%4u: %016llX ", te->Number, te->Offset); - for (int j = 0; j < sizeof(te->Hash); j++) + for (size_t j = 0; j < sizeof(te->Hash); j++) { printf("%02x ", te->Hash[j]); } diff --git a/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp b/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp index 70f54d2c4c..251666a823 100644 --- a/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp +++ b/src/ToolBox/superpmi/superpmi-shared/compileresult.cpp @@ -1043,7 +1043,7 @@ bool CompileResult::fndRecordCallSiteSigInfo(ULONG instrOffset, CORINFO_SIG_INFO Agnostic_RecordCallSite value = RecordCallSite->Get(instrOffset); - if (value.callSig.callConv == -1) + if (value.callSig.callConv == (DWORD)-1) return false; pCallSig->callConv = (CorInfoCallConv)value.callSig.callConv; diff --git a/src/ToolBox/superpmi/superpmi-shared/lightweightmap.h b/src/ToolBox/superpmi/superpmi-shared/lightweightmap.h index 3a425124ea..069287c1d3 100644 --- a/src/ToolBox/superpmi/superpmi-shared/lightweightmap.h +++ b/src/ToolBox/superpmi/superpmi-shared/lightweightmap.h @@ -345,7 +345,7 @@ public: return false; // found it. return position ///// } insert = first; - if (insert != first) + if (insert != (unsigned int)first) { LogDebug("index = %u f %u mid = %u l %u***************************", insert, first, mid, last); __debugbreak(); diff --git a/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp b/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp index 96ecb8d5f1..a6b284488a 100644 --- a/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp +++ b/src/ToolBox/superpmi/superpmi-shared/methodcontext.cpp @@ -3547,7 +3547,7 @@ void MethodContext::recGetClassGClayout(CORINFO_CLASS_HANDLE cls, BYTE* gcPtrs, void MethodContext::dmpGetClassGClayout(DWORDLONG key, const Agnostic_GetClassGClayout& value) { printf("GetClassGCLayout key %016llX, value len %u cnt %u {", key, value.len, value.valCount); - if (value.gcPtrs_Index != -1) + if (value.gcPtrs_Index != (DWORD)-1) { BYTE* ptr = (BYTE*)GetClassGClayout->GetBuffer(value.gcPtrs_Index); for (unsigned int i = 0; i < value.len; i++) @@ -3572,7 +3572,7 @@ unsigned MethodContext::repGetClassGClayout(CORINFO_CLASS_HANDLE cls, BYTE* gcPt unsigned int len = (unsigned int)value.len; unsigned int index = (unsigned int)value.gcPtrs_Index; - if (index != -1) + if (index != (unsigned int)-1) { BYTE* ptr = (BYTE*)GetClassGClayout->GetBuffer(index); for (unsigned int i = 0; i < len; i++) diff --git a/src/ToolBox/superpmi/superpmi-shared/tocfile.cpp b/src/ToolBox/superpmi/superpmi-shared/tocfile.cpp index f0979fc5c3..1994a3bcd7 100644 --- a/src/ToolBox/superpmi/superpmi-shared/tocfile.cpp +++ b/src/ToolBox/superpmi/superpmi-shared/tocfile.cpp @@ -47,7 +47,7 @@ void TOCFile::LoadToc(const char* inputFileName, bool validate) // Get the last 4 byte token (more abuse of LARGE_INTEGER) if (!ReadFile(hIndex, &val.u.HighPart, sizeof(DWORD), &read, nullptr) || (read != sizeof(DWORD)) || - (val.u.LowPart != val.u.HighPart)) + (val.u.LowPart != (DWORD)val.u.HighPart)) { CloseHandle(hIndex); this->Clear(); diff --git a/src/ToolBox/superpmi/superpmi/neardiffer.cpp b/src/ToolBox/superpmi/superpmi/neardiffer.cpp index aa1722eb1a..bb0c67fc34 100644 --- a/src/ToolBox/superpmi/superpmi/neardiffer.cpp +++ b/src/ToolBox/superpmi/superpmi/neardiffer.cpp @@ -330,7 +330,7 @@ bool NearDiffer::compareOffsets( // VSD calling case. size_t Offset1 = (ipRelOffset1 - 8); - if (data->cr->CallTargetTypes->GetIndex((DWORDLONG)Offset1) != (DWORD)-1) + if (data->cr->CallTargetTypes->GetIndex((DWORDLONG)Offset1) != -1) { // This logging is too noisy, so disable it. // LogVerbose("Found VSD callsite, did softer compare than ideal"); @@ -340,13 +340,13 @@ bool NearDiffer::compareOffsets( // x86 VSD calling cases. size_t Offset1b = (size_t)offset1 - 4; size_t Offset2b = (size_t)offset2; - if (data->cr->CallTargetTypes->GetIndex((DWORDLONG)Offset1b) != (DWORD)-1) + if (data->cr->CallTargetTypes->GetIndex((DWORDLONG)Offset1b) != -1) { // This logging is too noisy, so disable it. // LogVerbose("Found VSD callsite, did softer compare than ideal"); return true; } - if (data->cr->CallTargetTypes->GetIndex((DWORDLONG)Offset2b) != (DWORD)-1) + if (data->cr->CallTargetTypes->GetIndex((DWORDLONG)Offset2b) != -1) { // This logging is too noisy, so disable it. // LogVerbose("Found VSD callsite, did softer compare than ideal"); @@ -368,7 +368,7 @@ bool NearDiffer::compareOffsets( return true; realTargetAddr = (size_t)data->cr->searchAddressMap((void*)(gOffset2)); - if (realTargetAddr != -1) // we know this was passed out as a bbloc + if (realTargetAddr != (size_t)-1) // we know this was passed out as a bbloc return true; return false; |