diff --git a/include/llvm/ExecutionEngine/ExecutionEngine.h b/include/llvm/ExecutionEngine/ExecutionEngine.h
index 828cd3a962d..c2f8fed70df 100644
--- a/include/llvm/ExecutionEngine/ExecutionEngine.h
+++ b/include/llvm/ExecutionEngine/ExecutionEngine.h
@@ -63,6 +63,7 @@ public:
 class ExecutionEngine {
   const TargetData *TD;
   ExecutionEngineState state;
+  bool LazyCompilationDisabled;
 protected:
   /// Modules - This is a list of ModuleProvider's that we are JIT'ing from.  We
   /// use a smallvector to optimize for the case where there is only one module.
@@ -197,6 +198,15 @@ public:
   virtual void *getOrEmitGlobalVariable(const GlobalVariable *GV) {
     return getPointerToGlobal((GlobalValue*)GV);
   }
+  
+  /// DisableLazyCompilation - If called, the JIT will abort if lazy compilation
+  // is ever attempted.
+  void DisableLazyCompilation() {
+    LazyCompilationDisabled = true;
+  }
+  bool isLazyCompilationDisabled() const {
+    return LazyCompilationDisabled;
+  }
 
 protected:
   void emitGlobals();