From e488ba8466a5e72c755720c1c5db628631bce43f Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <vvasilev@cern.ch>
Date: Thu, 2 Nov 2017 16:02:06 +0100
Subject: [PATCH] Rely on Azog to allocate the memory in an exception-aware
 manner.

---
 lib/Interpreter/IncrementalJIT.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Interpreter/IncrementalJIT.cpp b/lib/Interpreter/IncrementalJIT.cpp
index 8188a2e8..963bbeb4 100644
--- a/lib/Interpreter/IncrementalJIT.cpp
+++ b/lib/Interpreter/IncrementalJIT.cpp
@@ -277,7 +277,7 @@ IncrementalJIT::IncrementalJIT(IncrementalExecutor& exe,
   m_TMDataLayout(m_TM->createDataLayout()),
   m_ExeMM(std::make_shared<ClingMemoryManager>(m_Parent)),
   m_NotifyObjectLoaded(*this),
-  m_ObjectLayer(m_SymbolMap, [this] () { return this->m_ExeMM; },
+  m_ObjectLayer(m_SymbolMap, [this] () { return llvm::make_unique<Azog>(*this); },
                 m_NotifyObjectLoaded, NotifyFinalizedT(*this)),
   m_CompileLayer(m_ObjectLayer, llvm::orc::SimpleCompiler(*m_TM)),
   m_LazyEmitLayer(m_CompileLayer) {