summaryrefslogtreecommitdiff
path: root/src/gcinfo
diff options
context:
space:
mode:
authorManu <manu-silicon@users.noreply.github.com>2015-12-09 16:54:37 +0900
committerManu <manu-silicon@users.noreply.github.com>2015-12-09 16:54:37 +0900
commit49c126fa79ed247e8494140893c99cd2cb8df30b (patch)
treecd543f02f897e70b60113864e696145c1b11915f /src/gcinfo
parentc27ae7b93c527b2f2865d530f5b4286b09c245cb (diff)
downloadcoreclr-49c126fa79ed247e8494140893c99cd2cb8df30b.tar.gz
coreclr-49c126fa79ed247e8494140893c99cd2cb8df30b.tar.bz2
coreclr-49c126fa79ed247e8494140893c99cd2cb8df30b.zip
Enable Linux compilation of LLILC
Fixed some C++ warnings that are treated as errors when compiling LLILC.
Diffstat (limited to 'src/gcinfo')
-rw-r--r--src/gcinfo/gcinfoencoder.cpp38
1 files changed, 19 insertions, 19 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);