diff options
| author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-09-03 20:19:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 20:19:50 -0700 |
| commit | b042edd2d3aab48fe9524381b8b445b910722d8d (patch) | |
| tree | ddfe0d2dfdbc9415676a824a6c6993bf4631cfd5 /src/vm/stublink.cpp | |
| parent | 0821f6f06f34146053356bf944d01aff086bb312 (diff) | |
| download | coreclr-b042edd2d3aab48fe9524381b8b445b910722d8d.tar.gz coreclr-b042edd2d3aab48fe9524381b8b445b910722d8d.tar.bz2 coreclr-b042edd2d3aab48fe9524381b8b445b910722d8d.zip | |
Deal with cross-bitness compilation warnings Pt.2 (#19781)
* Disable ASMCONSTANTS_C_ASSERT in cross-bitness scenario in src/vm/ceeload.cpp
* Adjust MAXFIELDMARSHALERSIZE for cross-bitness scenario in src/vm/arm/cgencpu.h
* Make ALLOC_ALIGN_CONSTANT host specific in src/inc/stdmacros.h
* Make PRECODE_ALIGNMENT host specific in src/vm/arm/cgencpu.h
* Disable unreachable code in src/vm/arm/stubs.cpp
* Adjust CorDBIPC_BUFFER_SIZE for cross-bitness scenario in src/debug/inc/dbgipcevents.h
* Disable warning C4359 in src/vm/arm/cgencpu.h
* Deal with warning C4267: 'initializing': conversion from 'size_t' to 'int' in src/vm/stublink.cpp
* Deal with warning C4267: 'initializing': conversion from 'size_t' to 'int' in src/vm/callingconvention.h
* Disable unreachable REGDISPLAY constructor in src/inc/regdisp.h
Diffstat (limited to 'src/vm/stublink.cpp')
| -rw-r--r-- | src/vm/stublink.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vm/stublink.cpp b/src/vm/stublink.cpp index d9715b7630..98e5b132f1 100644 --- a/src/vm/stublink.cpp +++ b/src/vm/stublink.cpp @@ -1624,7 +1624,7 @@ bool StubLinker::EmitUnwindInfo(Stub* pStub, int globalsize, LoaderHeap* pHeap) *pUnwindCodes++ = (BYTE)0xFF; // end } - int epilogUnwindCodeIndex = 0; + ptrdiff_t epilogUnwindCodeIndex = 0; //epilog differs from prolog if(m_cbStackFrame >= 4096) @@ -1659,7 +1659,7 @@ bool StubLinker::EmitUnwindInfo(Stub* pStub, int globalsize, LoaderHeap* pHeap) } // Number of 32-bit unwind codes - int codeWordsCount = (ALIGN_UP((size_t)pUnwindCodes, sizeof(void*)) - (size_t)pUnwindInfo - sizeof(DWORD))/4; + size_t codeWordsCount = (ALIGN_UP((size_t)pUnwindCodes, sizeof(void*)) - (size_t)pUnwindInfo - sizeof(DWORD))/4; _ASSERTE(epilogUnwindCodeIndex < 32); @@ -1669,8 +1669,8 @@ bool StubLinker::EmitUnwindInfo(Stub* pStub, int globalsize, LoaderHeap* pHeap) *(DWORD *)pUnwindInfo = ((functionLength) / 2) | (1 << 21) | - (epilogUnwindCodeIndex << 23)| - (codeWordsCount << 28); + ((int)epilogUnwindCodeIndex << 23)| + ((int)codeWordsCount << 28); #elif defined(_TARGET_ARM64_) if (!m_fProlog) |