JavaScriptCore-584.tar.gz

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

diff --git a/runtime/Error.cpp b/runtime/Error.cpp
index 5e21c8e56e54244104e7b81afde67bd27ccff6e1..ddd4bc4f5e1398ab60626d0ee06623b3cecdbc4c 100644 (file)
--- a/runtime/Error.cpp
+++ b/runtime/Error.cpp
@@ -26,6 +26,7 @@
 
 #include "ConstructData.h"
 #include "ErrorConstructor.h"
 
 #include "ConstructData.h"
 #include "ErrorConstructor.h"

+#include "JSFunction.h"

 #include "JSGlobalObject.h"
 #include "JSObject.h"
 #include "JSString.h"
 #include "JSGlobalObject.h"
 #include "JSObject.h"
 #include "JSString.h"


@@ -72,7 +73,7 @@ JSObject* Error::create(ExecState* exec, ErrorType type, const UString& message,
             break;
     }
 
             break;
     }
 

-    ArgList args;
+    MarkedArgumentBuffer args;

     if (message.isEmpty())
         args.append(jsString(exec, name));
     else
     if (message.isEmpty())
         args.append(jsString(exec, name));
     else


@@ -96,6 +97,12 @@ JSObject* Error::create(ExecState* exec, ErrorType type, const char* message)
     return create(exec, type, message, -1, -1, NULL);
 }
 
     return create(exec, type, message, -1, -1, NULL);
 }
 

+JSObject* throwError(ExecState* exec, JSObject* error)
+{
+    exec->setException(error);
+    return error;
+}
+

 JSObject* throwError(ExecState* exec, ErrorType type)
 {
     JSObject* error = Error::create(exec, type, UString(), -1, -1, NULL);
 JSObject* throwError(ExecState* exec, ErrorType type)
 {
     JSObject* error = Error::create(exec, type, UString(), -1, -1, NULL);