JavaScriptCore-7600.1.4.16.1.tar.gz

[apple/javascriptcore.git] / runtime / Error.cpp

diff --git a/runtime/Error.cpp b/runtime/Error.cpp
index 9cbe20b97393080493474544af67a13ffc11329d..c7ac3a585649d37e658726a634a8c466a4882e2d 100644 (file)
--- a/runtime/Error.cpp
+++ b/runtime/Error.cpp
@@ -34,7 +34,7 @@
 #include "JSObject.h"
 #include "JSString.h"
 #include "NativeErrorConstructor.h"
-#include "Operations.h"
+#include "JSCInlines.h"
 #include "SourceCode.h"
 
 #include <wtf/text/StringBuilder.h>
@@ -140,9 +140,6 @@ JSObject* addErrorInfo(CallFrame* callFrame, JSObject* error, int line, const So
         error->putDirect(*vm, Identifier(vm, linePropertyName), jsNumber(line), ReadOnly | DontDelete);
     if (!sourceURL.isNull())
         error->putDirect(*vm, Identifier(vm, sourceURLPropertyName), jsString(vm, sourceURL), ReadOnly | DontDelete);
-
-    vm->interpreter->addStackTraceIfNecessary(callFrame, error);
-
     return error;
 }
 
@@ -153,28 +150,14 @@ bool hasErrorInfo(ExecState* exec, JSObject* error)
         || error->hasProperty(exec, Identifier(exec, sourceURLPropertyName));
 }
 
-JSValue throwError(ExecState* exec, JSValue error)
-{
-    Interpreter::addStackTraceIfNecessary(exec, error);
-    exec->vm().exception = error;
-    return error;
-}
-
-JSObject* throwError(ExecState* exec, JSObject* error)
-{
-    Interpreter::addStackTraceIfNecessary(exec, error);
-    exec->vm().exception = error;
-    return error;
-}
-
 JSObject* throwTypeError(ExecState* exec)
 {
-    return throwError(exec, createTypeError(exec, ASCIILiteral("Type error")));
+    return exec->vm().throwException(exec, createTypeError(exec, ASCIILiteral("Type error")));
 }
 
 JSObject* throwSyntaxError(ExecState* exec)
 {
-    return throwError(exec, createSyntaxError(exec, ASCIILiteral("Syntax error")));
+    return exec->vm().throwException(exec, createSyntaxError(exec, ASCIILiteral("Syntax error")));
 }
 
 const ClassInfo StrictModeTypeErrorFunction::s_info = { "Function", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(StrictModeTypeErrorFunction) };