Make HashTbl and Scanner an inline instance of the Parser or a stack instance instead of allocating it in the heap

Parser will never have a NULL HashTbl or Scanner.

Author: curtisman

lib/Parser/BackgroundParser.cpp

@@ -32,7 +32,8 @@ BackgroundParser::~BackgroundParser()
         static_cast<JsUtil::BackgroundJobProcessor*>(processor)->IterateBackgroundThreads([&](JsUtil::ParallelThreadData *threadData)->bool {
             if (threadData->parser)
             {
-                threadData->parser->Release();
+                // Adelete to make sure dtor are called (since the HashTbl has its NoReleaseAllocator)
+                Adelete(threadData->threadArena, threadData->parser);
                 threadData->parser = nullptr;
             }
             return false;
@@ -79,7 +80,6 @@ bool BackgroundParser::Process(JsUtil::Job *const job, JsUtil::ParallelThreadDat
         // the background thread to decommit its pages.
         threadData->parser = Anew(threadData->threadArena, Parser, this->scriptContext, backgroundItem->IsStrictMode(), &threadData->backgroundPageAllocator, true);
         threadData->pse = Anew(threadData->threadArena, CompileScriptException);
-        threadData->parser->PrepareScanner(backgroundItem->GetParseContext()->fromExternal);
     }
 
     Parser *parser = threadData->parser;
@@ -143,7 +143,8 @@ void BackgroundParser::OnDecommit(JsUtil::ParallelThreadData *threadData)
 {
     if (threadData->parser)
     {
-        threadData->parser->Release();
+        // Adelete to make sure dtor are called (since the HashTbl has its NoReleaseAllocator)
+        Adelete(threadData->threadArena, threadData->parser);
         threadData->parser = nullptr;
     }
 }

lib/Parser/Hash.cpp

@@ -26,22 +26,6 @@ const HashTbl::ReservedWordInfo HashTbl::s_reservedWordInfo[tkID] =
 #include "keywords.h"
 };
 
-HashTbl * HashTbl::Create(uint cidHash)
-{
-    HashTbl * phtbl;
-
-    if (nullptr == (phtbl = HeapNewNoThrow(HashTbl)))
-        return nullptr;
-    if (!phtbl->Init(cidHash))
-    {
-        delete phtbl;  // invokes overridden operator delete
-        return nullptr;
-    }
-
-    return phtbl;
-}
-
-
 BOOL HashTbl::Init(uint cidHash)
 {
     // cidHash must be a power of two
@@ -368,11 +352,9 @@ IdentPtr HashTbl::FindExistingPid(
 {
     int32 bucketCount;
     IdentPtr pid;
-    IdentPtr *ppid = &m_prgpidName[luHash & m_luMask];
 
     /* Search the hash table for an existing match */
-    ppid = &m_prgpidName[luHash & m_luMask];
-
+    IdentPtr *ppid = &m_prgpidName[luHash & m_luMask];
     for (bucketCount = 0; nullptr != (pid = *ppid); ppid = &pid->m_pidNext, bucketCount++)
     {
         if (pid->m_luHash == luHash && (int)pid->m_cch == cch &&

lib/Parser/Hash.h

@@ -316,13 +316,17 @@ struct Ident
 class HashTbl
 {
 public:
-    static HashTbl * Create(uint cidHash);
-
-    void Release(void)
+    HashTbl(uint cidHash = DEFAULT_HASH_TABLE_SIZE)
     {
-        delete this;  // invokes overridden operator delete
+        AssertCanHandleOutOfMemory();
+        m_prgpidName = nullptr;
+        memset(&m_rpid, 0, sizeof(m_rpid));
+        if (!Init(cidHash))
+        {
+            Js::Throw::OutOfMemory();
+        }
     }
-
+    ~HashTbl(void) {}
 
     BOOL TokIsBinop(tokens tk, int *popl, OpCode *pnop)
     {
@@ -392,25 +396,15 @@ class HashTbl
     }
 
 private:
+    static const uint DEFAULT_HASH_TABLE_SIZE = 256;
+
     NoReleaseAllocator m_noReleaseAllocator;            // to allocate identifiers
     Ident ** m_prgpidName;        // hash table for names
 
     uint32 m_luMask;                // hash mask
     uint32 m_luCount;              // count of the number of entires in the hash table    
     IdentPtr m_rpid[tkLimKwd];
 
-    HashTbl()
-    {
-        m_prgpidName = nullptr;
-        memset(&m_rpid, 0, sizeof(m_rpid));
-    }
-    ~HashTbl(void) {}
-
-    void operator delete(void* p, size_t size)
-    {
-        HeapFree(p, size);
-    }
-
     // Called to grow the number of buckets in the table to reduce the table density.
     void Grow();