Changeset 34075 in webkit for trunk/JavaScriptCore

Timestamp:

May 23, 2008, 7:23:23 AM (17 years ago)

Author:

[email protected]

Message:

SQUIRRELFISH: JavaScript error messages are missing informative text

Reviewed by Anders

Partial fix.
Tidy up error messages, makes a couple of them provide slightly more info.
Inexplicably leads to a 1% SunSpider Progression.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/ExceptionHelpers.cpp (modified) (4 diffs)
• VM/ExceptionHelpers.h (modified) (1 diff)
• VM/Machine.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-23  Oliver Hunt  <[email protected]>
+
+        Reviewed by Anders.
+
+        SQUIRRELFISH: JavaScript error messages are missing informative text
+
+        Partial fix.
+        Tidy up error messages, makes a couple of them provide slightly more info.
+        Inexplicably leads to a 1% SunSpider Progression.
+
+        * VM/ExceptionHelpers.cpp:
+        (KJS::createError):
+        (KJS::createInvalidParamError):
+        (KJS::createNotAConstructorError):
+        (KJS::createNotAFunctionError):
+        * VM/ExceptionHelpers.h:
+        * VM/Machine.cpp:
+        (KJS::isNotObject):
+
 2008-05-23  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/VM/ExceptionHelpers.cpp

@@ -48 +48 @@
 JSValue* createError(ExecState* exec, ErrorType e, const char* msg)
 {
-    return Error::create(exec, e, msg, -1, -1, 0); // lineNo(), currentSourceId(exec), currentSourceURL(exec)
+    return Error::create(exec, e, msg, -1, -1, 0);
 }
 
@@ -55 +55 @@
     UString message = msg;
     substitute(message, label.ustring());
-    return Error::create(exec, e, message, -1, -1, 0); // lineNo(), currentSourceId(exec), currentSourceURL(exec)
+    return Error::create(exec, e, message, -1, -1, 0);
 }
 
@@ -64 +64 @@
     if (expr)
         substitute(message, expr->toString());
-    else
-        substitute(message, "<<no string for expression>>");
-    return Error::create(exec, e, message, -1, -1, 0); //, lineNo(), currentSourceId(exec), currentSourceURL(exec));
+    return Error::create(exec, e, message, -1, -1, 0);
+}
+
+JSValue* createError(ExecState* exec, ErrorType e, const char* msg, JSValue* v)
+{
+    UString message = msg;
+    substitute(message, v->toString(exec));
+    return Error::create(exec, e, message, -1, -1, 0);
 }
 
@@ -78 +83 @@
     return createError(exec, ReferenceError, "Can't find variable: %s", ident);
 }
-
-JSValue* createNotAnObjectError(ExecState* exec, JSValue* value, Node* expr)
+    
+JSValue* createInvalidParamError(ExecState* exec, const char* op, JSValue* v)
 {
-    return createError(exec, TypeError, "Value %s (result of expression %s) is not an object.", value, expr);
+    UString message = "'%s' is not a valid argument for '%s'";
+    substitute(message,  v->toString(exec));
+    substitute(message, op);
+    return Error::create(exec, TypeError, message, -1, -1, 0);
 }
 
 JSValue* createNotAConstructorError(ExecState* exec, JSValue* value, Node* expr)
 {
-    if (!value->isObject())
-        return createNotAnObjectError(exec, value, expr);
-    return createError(exec, TypeError, "Value %s (result of expression %s) is not a constructor. Cannot be used with new.", value, expr);
+    if (expr)
+        return createError(exec, TypeError, "Value %s (result of expression %s) is not a constructor. Cannot be used with new.", value, expr);
+    return createError(exec, TypeError, "Value %s is not a constructor. Cannot be used with new.", value);
 }
 
 JSValue* createNotAFunctionError(ExecState* exec, JSValue* value, Node* expr)
 {
-    if (!value->isObject())
-        return createNotAnObjectError(exec, value, expr);
-    return createError(exec, TypeError, "Value %s (result of expression %s) does not allow function calls.", value, expr);
+    if (expr)
+        return createError(exec, TypeError, "Value %s (result of expression %s) does not allow function calls.", value, expr);
+    return createError(exec, TypeError, "Value %s does not allow function calls.", value);
 }
 

trunk/JavaScriptCore/VM/ExceptionHelpers.h

@@ -36 +36 @@
     JSValue* createStackOverflowError(ExecState*);
     JSValue* createUndefinedVariableError(ExecState*, const Identifier&);
-    JSValue* createNotAnObjectError(ExecState*, JSValue*, Node*);
+    JSValue* createInvalidParamError(ExecState*, const char* op, JSValue*);
     JSValue* createNotAConstructorError(ExecState* exec, JSValue* value, Node* expr);
     JSValue* createNotAFunctionError(ExecState* exec, JSValue* value, Node* expr);

trunk/JavaScriptCore/VM/Machine.cpp

@@ -430 +430 @@
 }
 
-static NEVER_INLINE bool isNotObject(ExecState* exec, const Instruction*, CodeBlock*, JSValue* value, JSValue*& exceptionData)
+static NEVER_INLINE bool isNotObject(ExecState* exec, bool forInstanceOf, CodeBlock*, JSValue* value, JSValue*& exceptionData)
 {
     if (value->isObject())
         return false;
-    exceptionData = createNotAnObjectError(exec, value, 0);
+    exceptionData = createInvalidParamError(exec, forInstanceOf ? "instanceof" : "in" , value);
     return true;
 }