Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 5 insertions, 18 deletions

diff --git a/Source/JavaScriptCore/llint/LLIntExceptions.h b/Source/JavaScriptCore/llint/LLIntExceptions.h
index 3baa3f4a5..bdeb5e4a7 100644
--- a/Source/JavaScriptCore/llint/LLIntExceptions.h
+++ b/Source/JavaScriptCore/llint/LLIntExceptions.h
@@ -26,11 +26,7 @@
 #ifndef LLIntExceptions_h
 #define LLIntExceptions_h
 
-#include <wtf/Platform.h>
 #include <wtf/StdLibExtras.h>
-
-#if ENABLE(LLINT)
-
 #include "MacroAssemblerCodeRef.h"
 
 namespace JSC {
@@ -40,27 +36,18 @@ struct Instruction;
 
 namespace LLInt {
 
-// Throw the currently active exception in the context of the caller's call frame.
-void interpreterThrowInCaller(ExecState* callerFrame, ReturnAddressPtr);
-
 // Tells you where to jump to if you want to return-to-throw, after you've already
 // set up all information needed to throw the exception.
 Instruction* returnToThrowForThrownException(ExecState*);
 
-// Saves the current PC in the global data for safe-keeping, and gives you a PC
-// that you can tell the interpreter to go to, which when advanced between 1
-// and 9 slots will give you an "instruction" that threads to the interpreter's
-// exception handler. Note that if you give it the PC for exception handling,
-// it's smart enough to just return that PC without doing anything else; this
-// lets you thread exception handling through common helper functions used by
-// other helpers.
-Instruction* returnToThrow(ExecState*, Instruction*);
+// Gives you a PC that you can tell the interpreter to go to, which when advanced
+// between 1 and 9 slots will give you an "instruction" that threads to the
+// interpreter's exception handler.
+Instruction* returnToThrow(ExecState*);
 
 // Use this when you're throwing to a call thunk.
-void* callToThrow(ExecState*, Instruction*);
+void* callToThrow(ExecState*);
 
 } } // namespace JSC::LLInt
 
-#endif // ENABLE(LLINT)
-
 #endif // LLIntExceptions_h