From 8c3b4f2e78fb9e7c16a464062192f2796ab3650c Mon Sep 17 00:00:00 2001 From: Michael Kuperstein Date: Thu, 16 Jul 2015 12:20:31 +0000 Subject: Revert "Make ExecutionEngine owning a DataLayout" Reverting to fix buildbot breakage. This reverts commit r242387. llvm-svn: 242394 --- llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp') diff --git a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp index 14ce74fcc14..f103c09659a 100644 --- a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp +++ b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.cpp @@ -49,15 +49,16 @@ ExecutionEngine *Interpreter::create(std::unique_ptr M, // Interpreter ctor - Initialize stuff // Interpreter::Interpreter(std::unique_ptr M) - : ExecutionEngine(M->getDataLayout(), std::move(M)) { + : ExecutionEngine(std::move(M)), TD(Modules.back().get()) { memset(&ExitValue.Untyped, 0, sizeof(ExitValue.Untyped)); + setDataLayout(&TD); // Initialize the "backend" initializeExecutionEngine(); initializeExternalFunctions(); emitGlobals(); - IL = new IntrinsicLowering(getDataLayout()); + IL = new IntrinsicLowering(TD); } Interpreter::~Interpreter() { -- cgit v1.2.3