Define a mempool new operator for InterpCompiler like the one in the JIT and use it to allocate the GcInfoEncoder

Throw std::bad_alloc from Interp_NOMEM instead of trapping

Author: kg

src/coreclr/interpreter/compiler.cpp

@@ -4,6 +4,7 @@
 #include "interpreter.h"
 
 #include <inttypes.h>
+#include <new> // for std::bad_alloc
 
 static const StackType g_stackTypeFromInterpType[] =
 {
@@ -37,12 +38,7 @@ static const char *g_stackTypeString[] = { "I4", "I8", "R4", "R8", "O ", "VT", "
 /*****************************************************************************/
 void DECLSPEC_NORETURN Interp_NOMEM()
 {
-    // Ensure we don't return and that the compiler knows we won't
-#ifdef _MSC_VER
-    __debugbreak();
-#else
-    __builtin_trap();
-#endif
+    throw std::bad_alloc();
 }
 
 // GCInfoEncoder needs an IAllocator implementation. This is a simple one that forwards to the Compiler.
@@ -859,8 +855,8 @@ void InterpCompiler::EmitCode()
 void InterpCompiler::BuildGCInfo(InterpMethod *pInterpMethod)
 {
 #ifdef FEATURE_INTERPRETER
-    InterpIAllocator* pAllocator = new InterpIAllocator(this);
-    InterpreterGcInfoEncoder* gcInfoEncoder = new InterpreterGcInfoEncoder(m_compHnd, m_methodInfo, pAllocator, Interp_NOMEM);
+    InterpIAllocator* pAllocator = new (this) InterpIAllocator(this);
+    InterpreterGcInfoEncoder* gcInfoEncoder = new (this) InterpreterGcInfoEncoder(m_compHnd, m_methodInfo, pAllocator, Interp_NOMEM);
     assert(gcInfoEncoder);
 
     gcInfoEncoder->SetCodeLength(m_methodCodeSize);
@@ -876,11 +872,6 @@ void InterpCompiler::BuildGCInfo(InterpMethod *pInterpMethod)
     // GC Encoder automatically puts the GC info in the right spot using ICorJitInfo::allocGCInfo(size_t)
     // let's save the values anyway for debugging purposes
     gcInfoEncoder->Emit();
-
-    // Interpreter-FIXME: Why doesn't the JIT code do this? Is it because the placement new it uses automatically frees them
-    //  at the end of JIT compilation?
-    delete gcInfoEncoder;
-    delete pAllocator;
 #endif
 }
 

src/coreclr/interpreter/compiler.h

@@ -295,10 +295,12 @@ class InterpCompiler
     CORINFO_CLASS_HANDLE    ResolveClassToken(uint32_t token);
 
     void* AllocMethodData(size_t numBytes);
+public:
     // FIXME Mempool allocation currently leaks. We need to add an allocator and then
     // free all memory when method is finished compilling.
     void* AllocMemPool(size_t numBytes);
     void* AllocMemPool0(size_t numBytes);
+private:
     void* AllocTemporary(size_t numBytes);
     void* AllocTemporary0(size_t numBytes);
     void* ReallocTemporary(void* ptr, size_t numBytes);
@@ -436,4 +438,20 @@ class InterpCompiler
     int32_t* GetCode(int32_t *pCodeSize);
 };
 
+/*****************************************************************************
+ *  operator new
+ *
+ *  Uses the compiler's AllocMemPool0, which will eventually free automatically at the end of compilation (doesn't yet).
+ */
+
+ inline void* operator new(size_t sz, InterpCompiler* compiler)
+ {
+    return compiler->AllocMemPool0(sz);
+}
+
+ inline void* operator new[](size_t sz, InterpCompiler* compiler)
+ {
+     return compiler->AllocMemPool0(sz);
+ }
+
 #endif //_COMPILER_H_