Revert "Make ExecutionEngine owning a DataLayout"

[oota-llvm.git] / include / llvm / ExecutionEngine / ExecutionEngine.h

diff --git a/include/llvm/ExecutionEngine/ExecutionEngine.h b/include/llvm/ExecutionEngine/ExecutionEngine.h
index dbe99745b2f6d8ef9ba0a3431b5949840895915a..821c0181ce83da300d58a4adf02ced24fd11c44d 100644 (file)
--- a/include/llvm/ExecutionEngine/ExecutionEngine.h
+++ b/include/llvm/ExecutionEngine/ExecutionEngine.h
@@ -104,12 +104,7 @@ class ExecutionEngine {
   ExecutionEngineState EEState;
 
   /// The target data for the platform for which execution is being performed.
-  ///
-  /// Note: the DataLayout is LLVMContext specific because it has an
-  /// internal cache based on type pointers. It makes unsafe to reuse the
-  /// ExecutionEngine across context, we don't enforce this rule but undefined
-  /// behavior can occurs if the user tries to do it.
-  const DataLayout DL;
+  const DataLayout *DL;
 
   /// Whether lazy JIT compilation is enabled.
   bool CompilingLazily;
@@ -131,6 +126,8 @@ protected:
   /// optimize for the case where there is only one module.
   SmallVector<std::unique_ptr<Module>, 1> Modules;
 
+  void setDataLayout(const DataLayout *Val) { DL = Val; }
+
   /// getMemoryforGV - Allocate memory for a global variable.
   virtual char *getMemoryForGV(const GlobalVariable *GV);
 
@@ -197,7 +194,7 @@ public:
 
   //===--------------------------------------------------------------------===//
 
-  const DataLayout &getDataLayout() const { return DL; }
+  const DataLayout *getDataLayout() const { return DL; }
 
   /// removeModule - Remove a Module from the list of modules.  Returns true if
   /// M is found.
@@ -481,8 +478,8 @@ public:
   }
 
 protected:
-  ExecutionEngine(const DataLayout DL) : DL(std::move(DL)){};
-  explicit ExecutionEngine(const DataLayout DL, std::unique_ptr<Module> M);
+  ExecutionEngine() {}
+  explicit ExecutionEngine(std::unique_ptr<Module> M);
 
   void emitGlobals();