swb: fix build failures on Windows

Author: Jianchun Xu

lib/Backend/CodeGenNumberAllocator.h

@@ -100,8 +100,8 @@ class CodeGenNumberThreadAllocator
     bool hasNewChunkBlock;
     struct BlockRecord
     {
-        BlockRecord(__in_ecount_pagesize char * blockAddress, PageSegment * segment) 
-            : blockAddress(blockAddress), segment(segment) 
+        BlockRecord(__in_ecount_pagesize char * blockAddress, PageSegment * segment)
+            : blockAddress(blockAddress), segment(segment)
         {
         }
         char * blockAddress;
@@ -114,19 +114,19 @@ class CodeGenNumberThreadAllocator
     size_t pendingIntegrationChunkSegmentPageCount;
     DListBase<PageSegment> pendingIntegrationNumberSegment;
     DListBase<PageSegment> pendingIntegrationChunkSegment;
-    SListBase<BlockRecord> pendingIntegrationNumberBlock;
-    SListBase<BlockRecord> pendingIntegrationChunkBlock;
+    SListBase<BlockRecord, NoThrowHeapAllocator> pendingIntegrationNumberBlock;
+    SListBase<BlockRecord, NoThrowHeapAllocator> pendingIntegrationChunkBlock;
 
     // These are finished pages during the code gen of the current function
     // We can't integrate them until the code gen is done for the function,
     // because the references for the number is not set on the entry point yet.
-    SListBase<BlockRecord> pendingFlushNumberBlock;
-    SListBase<BlockRecord> pendingFlushChunkBlock;
+    SListBase<BlockRecord, NoThrowHeapAllocator> pendingFlushNumberBlock;
+    SListBase<BlockRecord, NoThrowHeapAllocator> pendingFlushChunkBlock;
 
     // Numbers are reference by the chunks, so we need to wait until that is ready
     // to be flushed before the number page can be flushed. Otherwise, we might have number
     // integrated back to the GC, but the chunk hasn't yet, thus GC won't see the reference.
-    SListBase<BlockRecord> pendingReferenceNumberBlock;
+    SListBase<BlockRecord, NoThrowHeapAllocator> pendingReferenceNumberBlock;
 };
 
 class CodeGenNumberAllocator

lib/Backend/PageAllocatorPool.cpp

@@ -86,7 +86,7 @@ PageAllocator* PageAllocatorPool::GetPageAllocator()
 void PageAllocatorPool::ReturnPageAllocator(PageAllocator* pageAllocator)
 {
     AutoCriticalSection autoCS(&cs);
-    if (!this->pageAllocators.PrependNoThrow(&HeapAllocator::Instance, pageAllocator))
+    if (!this->pageAllocators.PrependNoThrow(&NoThrowHeapAllocator::Instance, pageAllocator))
     {
         HeapDelete(pageAllocator);
     }

lib/Common/Memory/HeapAllocator.h

@@ -182,9 +182,21 @@ class NoThrowHeapAllocator
 {
 public:
     static const bool FakeZeroLengthArray = false;
+
     char * Alloc(DECLSPEC_GUARD_OVERFLOW size_t byteSize);
     char * AllocZero(DECLSPEC_GUARD_OVERFLOW size_t byteSize);
     void Free(void * buffer, size_t byteSize);
+
+    char * NoThrowAlloc(DECLSPEC_GUARD_OVERFLOW size_t byteSize)
+    {
+        return Alloc(byteSize);
+    }
+
+    char * NoThrowAllocZero(DECLSPEC_GUARD_OVERFLOW size_t byteSize)
+    {
+        return AllocZero(byteSize);
+    }
+
     static NoThrowHeapAllocator Instance;
 
 #ifdef TRACK_ALLOC

lib/Common/Memory/PageAllocator.cpp

@@ -62,9 +62,9 @@ SegmentBase<T>::~SegmentBase()
         {
             RecyclerWriteBarrierManager::ToggleBarrier(this->address, this->segmentPageCount * AutoSystemInfo::PageSize, false);
         }
-#endif
 #endif
         RecyclerWriteBarrierManager::OnSegmentFree(this->address, this->segmentPageCount);
+#endif
     }
 }
 
@@ -343,7 +343,7 @@ PageSegmentBase<T>::AllocPages(uint pageCount)
                 MemoryOperationLastError::RecordLastError();
                 if (this->GetAllocator()->processHandle == GetCurrentProcess())
                 {
-                    Assert(false);                    
+                    Assert(false);
                 }
                 return nullptr;
             }

lib/Common/Memory/RecyclerWriteBarrierManager.cpp

@@ -21,7 +21,7 @@
 
 #ifdef RECYCLER_WRITE_BARRIER
 #if ENABLE_DEBUG_CONFIG_OPTIONS
-namespace Memory 
+namespace Memory
 {
     FN_VerifyIsNotBarrierAddress* g_verifyIsNotBarrierAddress = nullptr;
 }
@@ -377,11 +377,11 @@ RecyclerWriteBarrierManager::IsBarrierAddress(void * address)
 bool
 RecyclerWriteBarrierManager::IsBarrierAddress(uintptr_t index)
 {
-    return cardTable[index] & WRITE_BARRIER_PAGE_BIT;
+    return (cardTable[index] & WRITE_BARRIER_PAGE_BIT) == WRITE_BARRIER_PAGE_BIT;
 }
 
-// TODO: SWB, looks we didn't initialize card table for heap allocation. 
-// we didn't hit such issue because we are not allocating write barrier 
+// TODO: SWB, looks we didn't initialize card table for heap allocation.
+// we didn't hit such issue because we are not allocating write barrier
 // annotated struct with heap today.
 // after SWB is widely enabled and if an annotated structure can be allocated
 // with both Heap and Recycler/Arena we'll capture the issue
@@ -406,10 +406,10 @@ RecyclerWriteBarrierManager::VerifyIsBarrierAddress(void * address, size_t bytes
         uintptr_t startIndex = GetCardTableIndex(address);
         char * endAddress = (char *)Math::Align<INT_PTR>((INT_PTR)((char *)address + bytes), s_WriteBarrierPageSize);
         uintptr_t endIndex = GetCardTableIndex(endAddress);
-        do 
+        do
         {
             // no need to check if cardTable is commited or not, if it's not commited it'll AV instead of assertion
-            if (!IsBarrierAddress(startIndex)) 
+            if (!IsBarrierAddress(startIndex))
             {
                 Js::Throw::FatalInternalError();
             }
@@ -425,11 +425,11 @@ RecyclerWriteBarrierManager::VerifyIsNotBarrierAddress(void * address, size_t by
         uintptr_t startIndex = GetCardTableIndex(address);
         char * endAddress = (char *)Math::Align<INT_PTR>((INT_PTR)((char *)address + bytes), s_WriteBarrierPageSize);
         uintptr_t endIndex = GetCardTableIndex(endAddress);
-        do 
+        do
         {
             if(IsCardTableCommited(startIndex))
             {
-                if (IsBarrierAddress(startIndex)) 
+                if (IsBarrierAddress(startIndex))
                 {
                     Js::Throw::FatalInternalError();
                 }
@@ -439,13 +439,13 @@ RecyclerWriteBarrierManager::VerifyIsNotBarrierAddress(void * address, size_t by
     }
 }
 
-bool 
+bool
 RecyclerWriteBarrierManager::Initialize()
 {
     g_verifyIsNotBarrierAddress = RecyclerWriteBarrierManager::VerifyIsNotBarrierAddress;
     return true;
 }
-#endif 
+#endif
 
 uintptr_t
 RecyclerWriteBarrierManager::GetCardTableIndex(void *address)

lib/JITServer/JITServer.h

@@ -12,7 +12,7 @@ class ServerContextManager
     static void CleanUpForProcess(HANDLE hProcess);
 
     static void RegisterScriptContext(ServerScriptContext* scriptContext);
-    static void UnRegisterScriptContext(ServerScriptContext* scriptContext);    
+    static void UnRegisterScriptContext(ServerScriptContext* scriptContext);
 
     static bool CheckLivenessAndAddref(ServerScriptContext* context);
     static bool CheckLivenessAndAddref(ServerThreadContext* context);
@@ -44,19 +44,19 @@ class ServerContextManager
         T* context;
         union {
             DWORD runtimeProcId;
-            ServerThreadContext* threadCtx; 
+            ServerThreadContext* threadCtx;
         };
         StackBackTrace* stack;
     };
 
     static void RecordCloseContext(ServerThreadContext* context)
     {
         auto record = HeapNewNoThrow(ClosedContextEntry<ServerThreadContext>, context);
-        if (record) 
+        if (record)
         {
             record->runtimeProcId = context->GetRuntimePid();
         }
-        ClosedThreadContextList.PrependNoThrow(&HeapAllocator::Instance, record);
+        ClosedThreadContextList.PrependNoThrow(&NoThrowHeapAllocator::Instance, record);
     }
     static void RecordCloseContext(ServerScriptContext* context)
     {
@@ -65,7 +65,7 @@ class ServerContextManager
         {
             record->threadCtx = context->GetThreadContext();
         }
-        ClosedScriptContextList.PrependNoThrow(&HeapAllocator::Instance, record);
+        ClosedScriptContextList.PrependNoThrow(&NoThrowHeapAllocator::Instance, record);
     }
 
     static SList<ClosedContextEntry<ServerThreadContext>*, NoThrowHeapAllocator> ClosedThreadContextList;

lib/Runtime/Base/ThreadContext.cpp

@@ -4130,7 +4130,7 @@ void ThreadContext::RemoveExternalWeakReferenceCache(ExternalWeakReferenceCache
 
 void ThreadContext::MarkExternalWeakReferencedObjects(bool inPartialCollect)
 {
-    SListBase<ExternalWeakReferenceCache *>::Iterator iteratorWeakRefCache(&this->externalWeakReferenceCacheList);
+    SListBase<ExternalWeakReferenceCache *, HeapAllocator>::Iterator iteratorWeakRefCache(&this->externalWeakReferenceCacheList);
     while (iteratorWeakRefCache.Next())
     {
         iteratorWeakRefCache.Data()->MarkNow(recycler, inPartialCollect);
@@ -4139,7 +4139,7 @@ void ThreadContext::MarkExternalWeakReferencedObjects(bool inPartialCollect)
 
 void ThreadContext::ResolveExternalWeakReferencedObjects()
 {
-    SListBase<ExternalWeakReferenceCache *>::Iterator iteratorWeakRefCache(&this->externalWeakReferenceCacheList);
+    SListBase<ExternalWeakReferenceCache *, HeapAllocator>::Iterator iteratorWeakRefCache(&this->externalWeakReferenceCacheList);
     while (iteratorWeakRefCache.Next())
     {
         iteratorWeakRefCache.Data()->ResolveNow(recycler);

lib/Runtime/Base/ThreadContext.h

@@ -654,7 +654,7 @@ class ThreadContext sealed :
     uint32 polymorphicCacheState;
 
 #ifdef ENABLE_PROJECTION
-    SListBase<ExternalWeakReferenceCache *> externalWeakReferenceCacheList;
+    SListBase<ExternalWeakReferenceCache *, HeapAllocator> externalWeakReferenceCacheList;
 #if DBG_DUMP
     IProjectionContextMemoryInfo *projectionMemoryInformation;
 #endif

lib/Runtime/Library/ForInObjectEnumerator.h

@@ -13,10 +13,12 @@ namespace Js
         struct ShadowData
         {
             ShadowData(RecyclableObject * initObject, RecyclableObject * firstPrototype, Recycler * recycler);
+
             Field(RecyclableObject *) currentObject;
             Field(RecyclableObject *) firstPrototype;
             Field(BVSparse<Recycler>) propertyIds;
-            Field(SListBase<Js::PropertyRecord const *, Recycler>) newPropertyStrings;
+            typedef SListBase<Js::PropertyRecord const *, Recycler> _PropertyStringsListType;
+            Field(_PropertyStringsListType) newPropertyStrings;
         } *shadowData;
 
         // States