Changeset 60708 in webkit for trunk/JavaScriptCore/runtime/Error.cpp

Timestamp:

Jun 4, 2010, 2:38:38 PM (15 years ago)

Author:

[email protected]

Message:

Bug 40187 - Change function signature of NativeConstructor to match NativeFunction

Reviewed by Oliver Hunt.

Mostly for consistency, but constructor & args arguments are redundant,
and this will help if we wish to be able to JIT calls to more constructors.

JavaScriptCore:

• API/JSCallbackConstructor.cpp:

(JSC::constructJSCallback):

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:

(JSC::::construct):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::executeConstruct):

• interpreter/Interpreter.h:
• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/ArrayConstructor.cpp:

(JSC::constructWithArrayConstructor):

• runtime/BooleanConstructor.cpp:

(JSC::constructWithBooleanConstructor):

• runtime/ConstructData.cpp:

(JSC::construct):

• runtime/ConstructData.h:
• runtime/DateConstructor.cpp:

(JSC::constructWithDateConstructor):

• runtime/Error.cpp:

(JSC::constructNativeError):
(JSC::Error::create):

• runtime/ErrorConstructor.cpp:

(JSC::constructWithErrorConstructor):

• runtime/FunctionConstructor.cpp:

(JSC::constructWithFunctionConstructor):

• runtime/NativeErrorConstructor.cpp:

(JSC::constructWithNativeErrorConstructor):

• runtime/NativeErrorConstructor.h:

(JSC::NativeErrorConstructor::errorStructure):

• runtime/NumberConstructor.cpp:

(JSC::constructWithNumberConstructor):

• runtime/ObjectConstructor.cpp:

(JSC::constructWithObjectConstructor):

• runtime/RegExpConstructor.cpp:

(JSC::constructWithRegExpConstructor):

• runtime/StringConstructor.cpp:

(JSC::constructWithStringConstructor):

WebCore:

• bindings/js/JSArrayBufferConstructor.cpp:

(WebCore::constructCanvasArrayBuffer):

• bindings/js/JSAudioConstructor.cpp:

(WebCore::constructAudio):

• bindings/js/JSEventSourceConstructor.cpp:

(WebCore::constructEventSource):

• bindings/js/JSFloatArrayConstructor.cpp:

(WebCore::constructCanvasFloatArray):

• bindings/js/JSImageConstructor.cpp:

(WebCore::constructImage):

• bindings/js/JSInt16ArrayConstructor.cpp:

(WebCore::constructCanvasShortArray):

• bindings/js/JSInt32ArrayConstructor.cpp:

(WebCore::constructCanvasIntArray):

• bindings/js/JSInt8ArrayConstructor.cpp:

(WebCore::constructCanvasByteArray):

• bindings/js/JSMessageChannelConstructor.cpp:

(WebCore::JSMessageChannelConstructor::construct):

• bindings/js/JSMessageChannelConstructor.h:
• bindings/js/JSOptionConstructor.cpp:

(WebCore::constructHTMLOptionElement):

• bindings/js/JSSharedWorkerConstructor.cpp:

(WebCore::constructSharedWorker):

• bindings/js/JSUint16ArrayConstructor.cpp:

(WebCore::constructCanvasUnsignedShortArray):

• bindings/js/JSUint32ArrayConstructor.cpp:

(WebCore::constructCanvasUnsignedIntArray):

• bindings/js/JSUint8ArrayConstructor.cpp:

(WebCore::constructCanvasUnsignedByteArray):

• bindings/js/JSWebKitCSSMatrixConstructor.cpp:

(WebCore::constructWebKitCSSMatrix):

• bindings/js/JSWebKitPointConstructor.cpp:

(WebCore::constructWebKitPoint):

• bindings/js/JSWebSocketConstructor.cpp:

(WebCore::constructWebSocket):

• bindings/js/JSWorkerConstructor.cpp:

(WebCore::constructWorker):

• bindings/js/JSXMLHttpRequestConstructor.cpp:

(WebCore::constructXMLHttpRequest):

• bindings/js/JSXSLTProcessorConstructor.cpp:

(WebCore::constructXSLTProcessor):

• bindings/scripts/CodeGeneratorJS.pm:
• bridge/runtime_object.cpp:

(JSC::Bindings::callRuntimeConstructor):

File:

• trunk/JavaScriptCore/runtime/Error.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/Error.cpp

@@ -39 +39 @@
 const char* expressionEndOffsetPropertyName = "expressionEndOffset";
 
+static JSObject* constructNativeError(ExecState* exec, const UString& message, NativeErrorConstructor* constructor, const char* name)
+{
+    ErrorInstance* object = new (exec) ErrorInstance(constructor->errorStructure());
+    JSString* messageString = message.isEmpty() ? jsString(exec, name) : jsString(exec, message);
+    object->putDirect(exec->propertyNames().message, messageString);
+    return object;
+}
+
 JSObject* Error::create(ExecState* exec, ErrorType type, const UString& message, int lineNumber, intptr_t sourceID, const UString& sourceURL)
 {
-    JSObject* constructor;
-    const char* name;
+    JSObject* error;
+
     switch (type) {
         case EvalError:
-            constructor = exec->lexicalGlobalObject()->evalErrorConstructor();
-            name = "Evaluation error";
+            error = constructNativeError(exec, message, exec->lexicalGlobalObject()->evalErrorConstructor(), "Evaluation error");
             break;
         case RangeError:
-            constructor = exec->lexicalGlobalObject()->rangeErrorConstructor();
-            name = "Range error";
+            error = constructNativeError(exec, message, exec->lexicalGlobalObject()->rangeErrorConstructor(), "Range error");
             break;
         case ReferenceError:
-            constructor = exec->lexicalGlobalObject()->referenceErrorConstructor();
-            name = "Reference error";
+            error = constructNativeError(exec, message, exec->lexicalGlobalObject()->referenceErrorConstructor(), "Reference error");
             break;
         case SyntaxError:
-            constructor = exec->lexicalGlobalObject()->syntaxErrorConstructor();
-            name = "Syntax error";
+            error = constructNativeError(exec, message, exec->lexicalGlobalObject()->syntaxErrorConstructor(), "Syntax error");
             break;
         case TypeError:
-            constructor = exec->lexicalGlobalObject()->typeErrorConstructor();
-            name = "Type error";
+            error = constructNativeError(exec, message, exec->lexicalGlobalObject()->typeErrorConstructor(), "Type error");
             break;
         case URIError:
-            constructor = exec->lexicalGlobalObject()->URIErrorConstructor();
-            name = "URI error";
+            error = constructNativeError(exec, message, exec->lexicalGlobalObject()->URIErrorConstructor(), "URI error");
             break;
         default:
-            constructor = exec->lexicalGlobalObject()->errorConstructor();
-            name = "Error";
-            break;
+            JSObject* constructor = exec->lexicalGlobalObject()->errorConstructor();
+            const char* name = "Error";
+            MarkedArgumentBuffer args;
+            if (message.isEmpty())
+                args.append(jsString(exec, name));
+            else
+                args.append(jsString(exec, message));
+            ConstructData constructData;
+            ConstructType constructType = constructor->getConstructData(constructData);
+            error = construct(exec, constructor, constructType, constructData, args);
     }
-
-    MarkedArgumentBuffer args;
-    if (message.isEmpty())
-        args.append(jsString(exec, name));
-    else
-        args.append(jsString(exec, message));
-    ConstructData constructData;
-    ConstructType constructType = constructor->getConstructData(constructData);
-    JSObject* error = construct(exec, constructor, constructType, constructData, args);
 
     if (lineNumber != -1)