diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-12-13 08:27:11 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-12-13 08:27:11 -0800 |
| commit | ed6636484dfd2e2394ee086424d9fc1a91a2f8be (patch) | |
| tree | 03c21bd5ecc26e28c5d9842fe4d544f47256441b | |
| parent | 9056da2d49c6ff1d27b630ac6b1ac3c973471b48 (diff) | |
| parent | 49c126fa79ed247e8494140893c99cd2cb8df30b (diff) | |
| download | coreclr-ed6636484dfd2e2394ee086424d9fc1a91a2f8be.tar.gz coreclr-ed6636484dfd2e2394ee086424d9fc1a91a2f8be.tar.bz2 coreclr-ed6636484dfd2e2394ee086424d9fc1a91a2f8be.zip | |
Merge pull request #2278 from manu-silicon/fix_llilc
Enable Linux compilation of LLILC
| -rw-r--r-- | src/gcinfo/gcinfoencoder.cpp | 38 | ||||
| -rw-r--r-- | src/inc/corinfo.h | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/src/gcinfo/gcinfoencoder.cpp b/src/gcinfo/gcinfoencoder.cpp index 7bc295a4d8..2eda737b21 100644 --- a/src/gcinfo/gcinfoencoder.cpp +++ b/src/gcinfo/gcinfoencoder.cpp @@ -691,7 +691,7 @@ void GcInfoEncoder::Build() UINT32 normPrologSize = NORMALIZE_CODE_OFFSET(intersectionStart); UINT32 normEpilogSize = NORMALIZE_CODE_OFFSET(m_CodeLength) - NORMALIZE_CODE_OFFSET(intersectionEnd); _ASSERTE(normPrologSize > 0 && normPrologSize < m_CodeLength); - _ASSERTE(normEpilogSize >= 0 && normEpilogSize < m_CodeLength); + _ASSERTE(normEpilogSize < m_CodeLength); GCINFO_WRITE_VARL_U(m_Info1, normPrologSize-1, NORM_PROLOG_SIZE_ENCBASE, ProEpilogSize); GCINFO_WRITE_VARL_U(m_Info1, normEpilogSize, NORM_EPILOG_SIZE_ENCBASE, ProEpilogSize); @@ -1096,8 +1096,8 @@ void GcInfoEncoder::Build() if(!IsAlwaysScratch(m_SlotTable[slotIndex])) { BYTE becomesLive = pCurrent->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); } @@ -1126,8 +1126,8 @@ void GcInfoEncoder::Build() { UINT32 slotIndex = (UINT32) (pFirstAfterStart->SlotId); BYTE becomesLive = pFirstAfterStart->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); if(++pFirstAfterStart == pEndTransitions) @@ -1144,8 +1144,8 @@ void GcInfoEncoder::Build() { UINT32 slotIndex = (UINT32) (pCurrent->SlotId); BYTE becomesLive = pCurrent->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); couldBeLive.SetBit(slotIndex); } @@ -1456,8 +1456,8 @@ void GcInfoEncoder::Build() { UINT32 slotIndex = pCurrent->SlotId; BYTE becomesLive = pCurrent->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); pCurrent++; } @@ -1543,8 +1543,8 @@ void GcInfoEncoder::Build() { UINT32 slotIndex = pCurrent->SlotId; BYTE becomesLive = pCurrent->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); pCurrent++; } @@ -1583,8 +1583,8 @@ void GcInfoEncoder::Build() { UINT32 slotIndex = pCurrent->SlotId; BYTE becomesLive = pCurrent->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); pCurrent++; } @@ -1683,8 +1683,8 @@ void GcInfoEncoder::Build() { UINT32 slotIndex = (UINT32) (pFirstAfterStart->SlotId); BYTE becomesLive = pFirstAfterStart->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); if(++pFirstAfterStart == pEndTransitions) @@ -1727,8 +1727,8 @@ void GcInfoEncoder::Build() UINT32 slotIndex = (UINT32) (pCurrent->SlotId); BYTE becomesLive = pCurrent->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); } @@ -1798,8 +1798,8 @@ void GcInfoEncoder::Build() { UINT32 slotIndex = (UINT32) (pCurrent->SlotId); BYTE becomesLive = pCurrent->BecomesLive; - _ASSERTE(liveState.ReadBit(slotIndex) && !becomesLive - || !liveState.ReadBit(slotIndex) && becomesLive); + _ASSERTE((liveState.ReadBit(slotIndex) && !becomesLive) + || (!liveState.ReadBit(slotIndex) && becomesLive)); liveState.WriteBit(slotIndex, becomesLive); couldBeLive.SetBit(slotIndex); diff --git a/src/inc/corinfo.h b/src/inc/corinfo.h index 442721b582..fef412678a 100644 --- a/src/inc/corinfo.h +++ b/src/inc/corinfo.h @@ -2145,7 +2145,7 @@ struct CORINFO_Object struct CORINFO_String : public CORINFO_Object { unsigned stringLen; - const wchar_t chars[1]; // actually of variable size + wchar_t chars[1]; // actually of variable size }; struct CORINFO_Array : public CORINFO_Object |