JavaScriptCore-7600.1.4.11.8.tar.gz

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

diff --git a/runtime/ErrorInstance.cpp b/runtime/ErrorInstance.cpp
index 2e2cdce9360d396552db898f0ca68821e59142e3..42e7c533c9b24da34e94c3900c2605c900340044 100644 (file)
--- a/runtime/ErrorInstance.cpp
+++ b/runtime/ErrorInstance.cpp
@@ -21,13 +21,30 @@
 #include "config.h"
 #include "ErrorInstance.h"
 
+#include "JSScope.h"
+#include "JSCInlines.h"
+
 namespace JSC {
 
-const ClassInfo ErrorInstance::info = { "Error", 0, 0, 0 };
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(ErrorInstance);
+
+const ClassInfo ErrorInstance::s_info = { "Error", &JSNonFinalObject::s_info, 0, 0, CREATE_METHOD_TABLE(ErrorInstance) };
 
-ErrorInstance::ErrorInstance(PassRefPtr<Structure> structure)
-    : JSObject(structure)
+ErrorInstance::ErrorInstance(VM& vm, Structure* structure)
+    : JSNonFinalObject(vm, structure)
+    , m_appendSourceToMessage(false)
 {
 }
 
+void ErrorInstance::finishCreation(VM& vm, const String& message, Vector<StackFrame> stackTrace)
+{
+    Base::finishCreation(vm);
+    ASSERT(inherits(info()));
+    if (!message.isNull())
+        putDirect(vm, vm.propertyNames->message, jsString(&vm, message), DontEnum);
+    
+    if (!stackTrace.isEmpty())
+        putDirect(vm, vm.propertyNames->stack, vm.interpreter->stackTraceAsString(vm.topCallFrame, stackTrace), DontEnum);
+}
+    
 } // namespace JSC