add a version of Utf8Helper conversion that uses a function to allocate.

Remove nonsense with global allocator for utf8 conversion in WabtInterface

Author: Cellule

lib/Common/Codex/Utf8Helper.h

@@ -13,8 +13,8 @@ namespace utf8
     /// using Allocator.
     /// The returned string is null terminated.
     ///
-    template <class Allocator>
-    HRESULT WideStringToNarrow(_In_ LPCWSTR sourceString, size_t sourceCount, _Out_ LPSTR* destStringPtr, _Out_ size_t* destCount)
+    template <typename AllocatorFunction>
+    HRESULT WideStringToNarrow(_In_ AllocatorFunction allocator, _In_ LPCWSTR sourceString, size_t sourceCount, _Out_ LPSTR* destStringPtr, _Out_ size_t* destCount)
     {
         size_t cchSourceString = sourceCount;
 
@@ -31,7 +31,7 @@ namespace utf8
             return E_OUTOFMEMORY;
         }
 
-        utf8char_t* destString = (utf8char_t*)Allocator::allocate(cbDestString);
+        utf8char_t* destString = (utf8char_t*)allocator(cbDestString);
         if (destString == nullptr)
         {
             return E_OUTOFMEMORY;
@@ -45,14 +45,20 @@ namespace utf8
         return S_OK;
     }
 
+    template <class Allocator>
+    HRESULT WideStringToNarrow(_In_ LPCWSTR sourceString, size_t sourceCount, _Out_ LPSTR* destStringPtr, _Out_ size_t* destCount)
+    {
+        return WideStringToNarrow(Allocator::allocate, sourceString, sourceCount, destStringPtr, destCount);
+    }
+
     ///
     /// Use the codex library to encode a UTF8 string to UTF16.
     /// The caller is responsible for freeing the memory, which is allocated
     /// using Allocator.
     /// The returned string is null terminated.
     ///
-    template <class Allocator>
-    HRESULT NarrowStringToWide(_In_ LPCSTR sourceString, size_t sourceCount, _Out_ LPWSTR* destStringPtr, _Out_ size_t* destCount)
+    template <typename AllocatorFunction>
+    HRESULT NarrowStringToWide(_In_ AllocatorFunction allocator,_In_ LPCSTR sourceString, size_t sourceCount, _Out_ LPWSTR* destStringPtr, _Out_ size_t* destCount)
     {
         size_t cbSourceString = sourceCount;
         charcount_t cchDestString = utf8::ByteIndexIntoCharacterIndex((LPCUTF8) sourceString, cbSourceString);
@@ -64,14 +70,14 @@ namespace utf8
             return E_OUTOFMEMORY;
         }
 
-        WCHAR* destString = (WCHAR*)Allocator::allocate(cbDestString);
+        WCHAR* destString = (WCHAR*)allocator(cbDestString);
         if (destString == nullptr)
         {
             return E_OUTOFMEMORY;
         }
 
         // Some node tests depend on the utf8 decoder not swallowing invalid unicode characters
-        // instead of replacing them with the "replacement" chracter. Pass a flag to our
+        // instead of replacing them with the "replacement" character. Pass a flag to our
         // decoder to require such behavior
         utf8::DecodeUnitsIntoAndNullTerminateNoAdvance(destString, (LPCUTF8) sourceString, (LPCUTF8) sourceString + cbSourceString, DecodeOptions::doAllowInvalidWCHARs);
         Assert(destString[cchDestString] == 0);
@@ -81,6 +87,12 @@ namespace utf8
         return S_OK;
     }
 
+    template <class Allocator>
+    HRESULT NarrowStringToWide(_In_ LPCSTR sourceString, size_t sourceCount, _Out_ LPWSTR* destStringPtr, _Out_ size_t* destCount)
+    {
+        return NarrowStringToWide(Allocator::allocate, sourceString, sourceCount, destStringPtr, destCount);
+    }
+
     class malloc_allocator
     {
     public:

lib/Runtime/Library/WabtInterface.cpp

@@ -18,15 +18,6 @@
 #include "Codex/Utf8Helper.h"
 using namespace wabt;
 
-ArenaAllocator* tempArenaPtr;
-struct utf8Allocator
-{
-    static byte* allocate(size_t size)
-    {
-        return AnewArray(tempArenaPtr, byte, size);
-    }
-};
-
 struct MemoryWriterContext
 {
     MemoryWriter* writer;
@@ -105,8 +96,8 @@ Js::Var Js::WabtInterface::EntryConvertWast2Wasm(RecyclableObject* function, Cal
     size_t origSize = string->GetLength();
     size_t wastSize;
     char* wastBuffer = nullptr;
-    tempArenaPtr = &arena;
-    utf8::WideStringToNarrow<utf8Allocator>(str, origSize, &wastBuffer, &wastSize);
+    auto allocator = [&arena](size_t size) {return (utf8char_t*)AnewArray(&arena, byte, size);};
+    utf8::WideStringToNarrow(allocator, str, origSize, &wastBuffer, &wastSize);
 
     AstLexer* lexer = new_ast_buffer_lexer("", wastBuffer, wastSize);
     struct AutoCleanLexer