some fixes for writebarrier verification

only build the verification related code when GLOBAL_ENABLE_WRITE_BARRIER is on

Author: leirocks

lib/Backend/JnHelperMethodList.h

@@ -334,7 +334,7 @@ HELPERCALL(OP_CmGe_A, Js::JavascriptOperators::OP_CmGe_A, AttrCanThrow)
 HELPERCALL(Conv_ToUInt32_Full, Js::JavascriptConversion::ToUInt32_Full, AttrCanThrow)
 HELPERCALL(Conv_ToUInt32, (uint32 (*)(Js::Var, Js::ScriptContext *))Js::JavascriptConversion::ToUInt32, AttrCanThrow)
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
 HELPERCALL(WriteBarrierSetVerifyBit, Memory::Recycler::WBSetBitJIT, 0)
 #endif
 #ifdef _M_IX86

lib/Backend/Lower.cpp

@@ -101,7 +101,7 @@ Lowerer::Lower()
 
     this->LowerRange(m_func->m_headInstr, m_func->m_tailInstr, defaultDoFastPath, loopFastPath);
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     // TODO: (leish)(swb) implement for arm
 #if defined(_M_IX86) || defined(_M_AMD64)
     if (CONFIG_FLAG(ForceSoftwareWriteBarrier) && CONFIG_FLAG(RecyclerVerifyMark))

lib/Backend/LowerMDShared.cpp

@@ -4784,7 +4784,7 @@ LowererMD::GenerateWriteBarrierAssign(IR::MemRefOpnd * opndDst, IR::Opnd * opndS
 
         IR::Instr * movInstr = IR::Instr::New(Js::OpCode::MOV, cardTableEntry, IR::IntConstOpnd::New(1, TyInt8, insertBeforeInstr->m_func), insertBeforeInstr->m_func);
         insertBeforeInstr->InsertBefore(movInstr);
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
         if (CONFIG_FLAG(ForceSoftwareWriteBarrier) && CONFIG_FLAG(RecyclerVerifyMark))
         {
             this->LoadHelperArgument(insertBeforeInstr, opndDst);

lib/Common/Memory/HeapBlock.cpp

@@ -785,7 +785,7 @@ SmallHeapBlockT<TBlockAttributes>::ClearExplicitFreeBitForObject(void* objectAdd
 
 #ifdef RECYCLER_VERIFY_MARK
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
 void HeapBlock::WBPrintMissingBarrier(Recycler* recycler, char* objectAddress, char* target)
 {
 #ifdef TRACK_ALLOC
@@ -968,7 +968,7 @@ SmallHeapBlockT<TBlockAttributes>::VerifyMark()
                         void* target = *(void**) objectAddress;
                         if (recycler->VerifyMark(target))
                         {
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
                             if (CONFIG_FLAG(ForceSoftwareWriteBarrier))
                             {
                                 uint verifyBitIndex = (BVIndex)(objectAddress - this->address) / sizeof(void*);
@@ -1418,7 +1418,7 @@ SmallHeapBlockT<TBlockAttributes>::EnqueueProcessedObject(FreeObject ** list, vo
     freeObject->SetNext(*list);
     *list = freeObject;
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     if (CONFIG_FLAG(ForceSoftwareWriteBarrier) && CONFIG_FLAG(RecyclerVerifyMark))
     {
         this->WBClearBits((char*)objectAddress);

lib/Common/Memory/HeapBlock.h

@@ -315,13 +315,14 @@ class HeapBlock
 
         return false;
     }
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     virtual void WBSetBit(char* addr) = 0;
     virtual void WBSetBits(char* addr, uint length) = 0;
     virtual void WBClearBits(char* addr) = 0;
-
     void WBPrintMissingBarrier(Recycler* recycler, char* objectAddress, char* target);
+#endif
 
+#if DBG
     virtual BOOL IsFreeObject(void* objectAddress) = 0;
 #endif
     virtual BOOL IsValidObject(void* objectAddress) = 0;
@@ -462,7 +463,7 @@ class SmallHeapBlockT : public HeapBlock
     void ProtectUnusablePages() {}
     void RestoreUnusablePages() {}
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     virtual void WBSetBit(char* addr) override
     {
         uint index = (uint)(addr - this->address) / sizeof(void*);

lib/Common/Memory/LargeHeapBlock.cpp

@@ -175,7 +175,7 @@ LargeHeapBlock::LargeHeapBlock(__in char * address, size_t pageCount, Segment *
 #if defined(RECYCLER_PAGE_HEAP) && defined(STACK_BACK_TRACE)
     , pageHeapAllocStack(nullptr), pageHeapFreeStack(nullptr)
 #endif
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     ,wbVerifyBits(&HeapAllocator::Instance)
 #endif
 {
@@ -851,7 +851,7 @@ LargeHeapBlock::VerifyMark()
 
             if (recycler->VerifyMark(target))
             {
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
                 if (CONFIG_FLAG(ForceSoftwareWriteBarrier))
                 {
                     if (!this->wbVerifyBits.Test((BVIndex)(objectAddress - this->address) / sizeof(void*)))
@@ -2103,7 +2103,7 @@ LargeHeapBlock::CapturePageHeapFreeStack()
 }
 #endif
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
 void LargeHeapBlock::WBSetBit(char* addr)
 {
     uint index = (uint)(addr - this->address) / sizeof(void*);

lib/Common/Memory/LargeHeapBlock.h

@@ -303,7 +303,7 @@ class LargeHeapBlock sealed : public HeapBlock
     void ** GetTrackerDataArray();
 #endif
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
 private:
     BVSparse<HeapAllocator> wbVerifyBits;
 public:

lib/Common/Memory/Recycler.cpp

@@ -463,12 +463,12 @@ Recycler::~Recycler()
 #if ENABLE_CONCURRENT_GC
     Assert(!this->isAborting);
 #endif
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     if (recyclerList == this)
     {
         recyclerList = this->next;
     }
-    else
+    else if(recyclerList)
     {
         Recycler* list = recyclerList;
         while (list->next != this)
@@ -734,7 +734,7 @@ Recycler::RootRelease(void* obj, uint *count)
     // another GC if there is an exhaustive GC going on.
     this->CollectNow<CollectExhaustiveCandidate>();
 }
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
 Recycler* Recycler::recyclerList = nullptr;
 #endif
 
@@ -921,7 +921,7 @@ Recycler::Initialize(const bool forceInThread, JsUtil::ThreadService *threadServ
 #else
     Assert(!needWriteWatch);
 #endif
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     this->next = recyclerList;
     recyclerList = this;
 #endif
@@ -8555,7 +8555,7 @@ Recycler::UnRegisterPendingWriteBarrierBlock(void* address)
 }
 #endif
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
 void 
 Recycler::WBSetBit(char* addr)
 {

lib/Common/Memory/Recycler.h

@@ -1938,7 +1938,7 @@ class Recycler
     void UnRegisterPendingWriteBarrierBlock(void* address);
 #endif
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
 private:
     static Recycler* recyclerList;
     Recycler* next;
@@ -2121,11 +2121,13 @@ class RecyclerHeapObjectInfo
 class CollectedRecyclerWeakRefHeapBlock : public HeapBlock
 {
 public:
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     virtual void WBSetBit(char* addr) override { Assert(false); }
     virtual void WBSetBits(char* addr, uint length) override { Assert(false); }
     virtual void WBClearBits(char* addr) override { Assert(false); }
+#endif
 
+#if DBG
     virtual BOOL IsFreeObject(void* objectAddress) override { Assert(false); return false; }
 #endif
     virtual BOOL IsValidObject(void* objectAddress) override { Assert(false); return false; }

lib/Common/Memory/Recycler.inl

@@ -275,7 +275,7 @@ Recycler::AllocZeroWithAttributesInlined(DECLSPEC_GUARD_OVERFLOW size_t size)
     VerifyPageHeapFillAfterAlloc<attributes>(obj, size);
 #endif
 
-#if DBG
+#if DBG && GLOBAL_ENABLE_WRITE_BARRIER
     if (CONFIG_FLAG(ForceSoftwareWriteBarrier) && CONFIG_FLAG(RecyclerVerifyMark))
     {
         this->FindHeapBlock(obj)->WBClearBits(obj);