3 files changed, 0 insertions, 22 deletions
diff --git a/tools/lli/RecordingMemoryManager.cpp b/tools/lli/RecordingMemoryManager.cpp
index e4d992d..1fa8176 100644
--- a/tools/lli/RecordingMemoryManager.cpp
+++ b/tools/lli/RecordingMemoryManager.cpp
@@ -98,17 +98,6 @@ uint8_t *RecordingMemoryManager::allocateGlobal(uintptr_t Size, unsigned Alignme
 void RecordingMemoryManager::deallocateFunctionBody(void *Body) {
   llvm_unreachable("Unexpected!");
 }
-uint8_t* RecordingMemoryManager::startExceptionTable(const Function* F, uintptr_t &ActualSize) {
-  llvm_unreachable("Unexpected!");
-  return 0;
-}
-void RecordingMemoryManager::endExceptionTable(const Function *F, uint8_t *TableStart,
-                                               uint8_t *TableEnd, uint8_t* FrameRegister) {
-  llvm_unreachable("Unexpected!");
-}
-void RecordingMemoryManager::deallocateExceptionTable(void *ET) {
-  llvm_unreachable("Unexpected!");
-}
 
 static int jit_noop() {
   return 0;
diff --git a/tools/lli/RecordingMemoryManager.h b/tools/lli/RecordingMemoryManager.h
index 991f535..f3d026f 100644
--- a/tools/lli/RecordingMemoryManager.h
+++ b/tools/lli/RecordingMemoryManager.h
@@ -75,11 +75,6 @@ public:
   uint8_t *allocateSpace(intptr_t Size, unsigned Alignment);
   uint8_t *allocateGlobal(uintptr_t Size, unsigned Alignment);
   void deallocateFunctionBody(void *Body);
-  uint8_t* startExceptionTable(const Function* F, uintptr_t &ActualSize);
-  void endExceptionTable(const Function *F, uint8_t *TableStart,
-                         uint8_t *TableEnd, uint8_t* FrameRegister);
-  void deallocateExceptionTable(void *ET);
-
 };
 
 } // end namespace llvm
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index 297763f..1866403 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -159,11 +159,6 @@ namespace {
                      clEnumValEnd));
 
   cl::opt<bool>
-  EnableJITExceptionHandling("jit-enable-eh",
-    cl::desc("Emit exception handling information"),
-    cl::init(false));
-
-  cl::opt<bool>
   GenerateSoftFloatCalls("soft-float",
     cl::desc("Generate software floating point library calls"),
     cl::init(false));
@@ -381,7 +376,6 @@ int main(int argc, char **argv, char * const *envp) {
 
   // Remote target execution doesn't handle EH or debug registration.
   if (!RemoteMCJIT) {
-    Options.JITExceptionHandling = EnableJITExceptionHandling;
     Options.JITEmitDebugInfo = EmitJitDebugInfo;
     Options.JITEmitDebugInfoToDisk = EmitJitDebugInfoToDisk;
   }