JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/runtime/ExceptionHelpers.cpp b/runtime/ExceptionHelpers.cpp
index 6a668d465064bb609916529a15ed51ce6b767db6..b8a6285c50b6b9cd4a3600c671ca72471ec17460 100644 (file)
--- a/runtime/ExceptionHelpers.cpp
+++ b/runtime/ExceptionHelpers.cpp
@@ -32,19 +32,21 @@
 #include "CodeBlock.h"
 #include "CallFrame.h"
 #include "ErrorHandlingScope.h"
 #include "CodeBlock.h"
 #include "CallFrame.h"
 #include "ErrorHandlingScope.h"

-#include "ErrorInstance.h"
+#include "Exception.h"

 #include "JSGlobalObjectFunctions.h"
 #include "JSGlobalObjectFunctions.h"

-#include "JSObject.h"

 #include "JSNotAnObject.h"
 #include "Interpreter.h"
 #include "Nodes.h"
 #include "JSCInlines.h"
 #include "JSNotAnObject.h"
 #include "Interpreter.h"
 #include "Nodes.h"
 #include "JSCInlines.h"

+#include "RuntimeType.h"
+#include <wtf/text/StringBuilder.h>
+#include <wtf/text/StringView.h>

 
 namespace JSC {
 
 STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(TerminatedExecutionError);
 
 
 namespace JSC {
 
 STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(TerminatedExecutionError);
 

-const ClassInfo TerminatedExecutionError::s_info = { "TerminatedExecutionError", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(TerminatedExecutionError) };
+const ClassInfo TerminatedExecutionError::s_info = { "TerminatedExecutionError", &Base::s_info, 0, CREATE_METHOD_TABLE(TerminatedExecutionError) };

 
 JSValue TerminatedExecutionError::defaultValue(const JSObject*, ExecState* exec, PreferredPrimitiveType hint)
 {
 
 JSValue TerminatedExecutionError::defaultValue(const JSObject*, ExecState* exec, PreferredPrimitiveType hint)
 {


@@ -58,31 +60,19 @@ JSObject* createTerminatedExecutionException(VM* vm)
     return TerminatedExecutionError::create(*vm);
 }
 
     return TerminatedExecutionError::create(*vm);
 }
 

-bool isTerminatedExecutionException(JSObject* object)
+bool isTerminatedExecutionException(Exception* exception)

 {
 {

-    return object->inherits(TerminatedExecutionError::info());
+    return exception->value().inherits(TerminatedExecutionError::info());

 }
 
 }
 

-bool isTerminatedExecutionException(JSValue value)
-{
-    return value.inherits(TerminatedExecutionError::info());
-}
-
-

 JSObject* createStackOverflowError(ExecState* exec)
 {
     return createRangeError(exec, ASCIILiteral("Maximum call stack size exceeded."));
 }
 
 JSObject* createStackOverflowError(ExecState* exec)
 {
     return createRangeError(exec, ASCIILiteral("Maximum call stack size exceeded."));
 }
 

-JSObject* createStackOverflowError(JSGlobalObject* globalObject)
-{
-    return createRangeError(globalObject, ASCIILiteral("Maximum call stack size exceeded."));
-}
-

 JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
 {
 JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
 {

-    
-    if (ident.impl()->isEmptyUnique()) {
+    if (exec->propertyNames().isPrivateName(ident)) {

         String message(makeString("Can't find private variable: @", exec->propertyNames().getPublicName(ident).string()));
         return createReferenceError(exec, message);
     }
         String message(makeString("Can't find private variable: @", exec->propertyNames().getPublicName(ident).string()));
         return createReferenceError(exec, message);
     }


@@ -92,76 +82,194 @@ JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
     
 JSString* errorDescriptionForValue(ExecState* exec, JSValue v)
 {
     
 JSString* errorDescriptionForValue(ExecState* exec, JSValue v)
 {

-    VM& vm = exec->vm();
-    if (v.isNull())
-        return vm.smallStrings.nullString();
-    if (v.isUndefined())
-        return vm.smallStrings.undefinedString();
-    if (v.isInt32())
-        return jsString(&vm, vm.numericStrings.add(v.asInt32()));
-    if (v.isDouble())
-        return jsString(&vm, vm.numericStrings.add(v.asDouble()));
-    if (v.isTrue())
-        return vm.smallStrings.trueString();
-    if (v.isFalse())
-        return vm.smallStrings.falseString();

     if (v.isString())
     if (v.isString())

-        return jsCast<JSString*>(v.asCell());
+        return jsNontrivialString(exec, makeString('"',  asString(v)->value(exec), '"'));

     if (v.isObject()) {
         CallData callData;
         JSObject* object = asObject(v);
         if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
     if (v.isObject()) {
         CallData callData;
         JSObject* object = asObject(v);
         if (object->methodTable()->getCallData(object, callData) != CallTypeNone)

-            return vm.smallStrings.functionString();
-        return jsString(exec, object->methodTable()->className(object));
+            return exec->vm().smallStrings.functionString();
+        return jsString(exec, JSObject::calculatedClassName(object));

     }
     }

-    
-    // The JSValue should never be empty, so this point in the code should never be reached.
-    ASSERT_NOT_REACHED();
-    return vm.smallStrings.emptyString();
+    return v.toString(exec);

 }
     
 }
     

-JSObject* createError(ExecState* exec, ErrorFactory errorFactory, JSValue value, const String& message)
+static String defaultApproximateSourceError(const String& originalMessage, const String& sourceText)
+{
+    return makeString(originalMessage, " (near '...", sourceText, "...')");
+}
+
+static String defaultSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType, ErrorInstance::SourceTextWhereErrorOccurred occurrence)
+{
+    if (occurrence == ErrorInstance::FoundApproximateSource)
+        return defaultApproximateSourceError(originalMessage, sourceText);
+
+    ASSERT(occurrence == ErrorInstance::FoundExactSource);
+    return makeString(originalMessage, " (evaluating '", sourceText, "')");
+}
+
+static String functionCallBase(const String& sourceText)
+{ 
+    // This function retrieves the 'foo.bar' substring from 'foo.bar(baz)'.
+    // FIXME: This function has simple processing of /* */ style comments.
+    // It doesn't properly handle embedded comments of string literals that contain
+    // parenthesis or comment constructs, e.g. foo.bar("/abc\)*/").
+    // https://bugs.webkit.org/show_bug.cgi?id=146304
+
+    unsigned sourceLength = sourceText.length();
+    unsigned idx = sourceLength - 1;
+    if (sourceLength < 2 || sourceText[idx] != ')') {
+        // For function calls that have many new lines in between their open parenthesis
+        // and their closing parenthesis, the text range passed into the message appender 
+        // will not inlcude the text in between these parentheses, it will just be the desired
+        // text that precedes the parentheses.
+        return sourceText;
+    }
+
+    unsigned parenStack = 1;
+    bool isInMultiLineComment = false;
+    idx -= 1;
+    // Note that we're scanning text right to left instead of the more common left to right, 
+    // so syntax detection is backwards.
+    while (parenStack > 0) {
+        UChar curChar = sourceText[idx];
+        if (isInMultiLineComment)  {
+            if (idx > 0 && curChar == '*' && sourceText[idx - 1] == '/') {
+                isInMultiLineComment = false;
+                idx -= 1;
+            }
+        } else if (curChar == '(')
+            parenStack -= 1;
+        else if (curChar == ')')
+            parenStack += 1;
+        else if (idx > 0 && curChar == '/' && sourceText[idx - 1] == '*') {
+            isInMultiLineComment = true;
+            idx -= 1;
+        }
+
+        if (!idx)
+            break;
+
+        idx -= 1;
+    }
+
+    return sourceText.left(idx + 1);
+}
+
+static String notAFunctionSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType type, ErrorInstance::SourceTextWhereErrorOccurred occurrence)

 {
 {

-    String errorMessage = makeString(errorDescriptionForValue(exec, value)->value(exec), " ", message);
-    JSObject* exception = errorFactory(exec, errorMessage);
+    ASSERT(type != TypeFunction);
+
+    if (occurrence == ErrorInstance::FoundApproximateSource)
+        return defaultApproximateSourceError(originalMessage, sourceText);
+
+    ASSERT(occurrence == ErrorInstance::FoundExactSource);
+    auto notAFunctionIndex = originalMessage.reverseFind("is not a function");
+    RELEASE_ASSERT(notAFunctionIndex != notFound);
+    StringView displayValue;
+    if (originalMessage.is8Bit()) 
+        displayValue = StringView(originalMessage.characters8(), notAFunctionIndex - 1);
+    else
+        displayValue = StringView(originalMessage.characters16(), notAFunctionIndex - 1);
+
+    String base = functionCallBase(sourceText);
+    StringBuilder builder;
+    builder.append(base);
+    builder.appendLiteral(" is not a function. (In '");
+    builder.append(sourceText);
+    builder.appendLiteral("', '");
+    builder.append(base);
+    builder.appendLiteral("' is ");
+    if (type == TypeObject)
+        builder.appendLiteral("an instance of ");
+    builder.append(displayValue);
+    builder.appendLiteral(")");
+
+    return builder.toString();
+}
+
+static String invalidParameterInSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType type, ErrorInstance::SourceTextWhereErrorOccurred occurrence)
+{
+    ASSERT_UNUSED(type, type != TypeObject);
+
+    if (occurrence == ErrorInstance::FoundApproximateSource)
+        return defaultApproximateSourceError(originalMessage, sourceText);
+
+    ASSERT(occurrence == ErrorInstance::FoundExactSource);
+    auto inIndex = sourceText.reverseFind("in");
+    RELEASE_ASSERT(inIndex != notFound);
+    if (sourceText.find("in") != inIndex)
+        return makeString(originalMessage, " (evaluating '", sourceText, "')");
+
+    static const unsigned inLength = 2;
+    String rightHandSide = sourceText.substring(inIndex + inLength).simplifyWhiteSpace();
+    return makeString(rightHandSide, " is not an Object. (evaluating '", sourceText, "')");
+}
+
+static String invalidParameterInstanceofSourceAppender(const String& originalMessage, const String& sourceText, RuntimeType, ErrorInstance::SourceTextWhereErrorOccurred occurrence)
+{
+    if (occurrence == ErrorInstance::FoundApproximateSource)
+        return defaultApproximateSourceError(originalMessage, sourceText);
+
+    ASSERT(occurrence == ErrorInstance::FoundExactSource);
+    auto instanceofIndex = sourceText.reverseFind("instanceof");
+    RELEASE_ASSERT(instanceofIndex != notFound);
+    if (sourceText.find("instanceof") != instanceofIndex)
+        return makeString(originalMessage, " (evaluating '", sourceText, "')");
+
+    static const unsigned instanceofLength = 10;
+    String rightHandSide = sourceText.substring(instanceofIndex + instanceofLength).simplifyWhiteSpace();
+    return makeString(rightHandSide, " is not a function. (evaluating '", sourceText, "')");
+}
+
+JSObject* createError(ExecState* exec, JSValue value, const String& message, ErrorInstance::SourceAppender appender)
+{
+    String errorMessage = makeString(errorDescriptionForValue(exec, value)->value(exec), ' ', message);
+    JSObject* exception = createTypeError(exec, errorMessage, appender, runtimeTypeForValue(value));
+    ASSERT(exception->isErrorInstance());
+    return exception;
+}
+
+JSObject* createInvalidFunctionApplyParameterError(ExecState* exec, JSValue value)
+{
+    JSObject* exception = createTypeError(exec, makeString("second argument to Function.prototype.apply must be an Array-like object"), defaultSourceAppender, runtimeTypeForValue(value));

     ASSERT(exception->isErrorInstance());
     ASSERT(exception->isErrorInstance());

-    static_cast<ErrorInstance*>(exception)->setAppendSourceToMessage();

     return exception;
 }
 
     return exception;
 }
 

-JSObject* createInvalidParameterError(ExecState* exec, const char* op, JSValue value)
+JSObject* createInvalidInParameterError(ExecState* exec, JSValue value)

 {
 {

-    return createError(exec, createTypeError, value, makeString("is not a valid argument for '", op, "'"));
+    return createError(exec, value, makeString("is not an Object."), invalidParameterInSourceAppender);
+}
+
+JSObject* createInvalidInstanceofParameterError(ExecState* exec, JSValue value)
+{
+    return createError(exec, value, makeString("is not a function."), invalidParameterInstanceofSourceAppender);

 }
 
 JSObject* createNotAConstructorError(ExecState* exec, JSValue value)
 {
 }
 
 JSObject* createNotAConstructorError(ExecState* exec, JSValue value)
 {

-    return createError(exec, createTypeError, value, "is not a constructor");
+    return createError(exec, value, ASCIILiteral("is not a constructor"), defaultSourceAppender);

 }
 
 JSObject* createNotAFunctionError(ExecState* exec, JSValue value)
 {
 }
 
 JSObject* createNotAFunctionError(ExecState* exec, JSValue value)
 {

-    return createError(exec, createTypeError, value, "is not a function");
+    return createError(exec, value, ASCIILiteral("is not a function"), notAFunctionSourceAppender);

 }
 
 JSObject* createNotAnObjectError(ExecState* exec, JSValue value)
 {
 }
 
 JSObject* createNotAnObjectError(ExecState* exec, JSValue value)
 {

-    return createError(exec, createTypeError, value, "is not an object");
+    return createError(exec, value, ASCIILiteral("is not an object"), defaultSourceAppender);

 }
 
 JSObject* createErrorForInvalidGlobalAssignment(ExecState* exec, const String& propertyName)
 {
 }
 
 JSObject* createErrorForInvalidGlobalAssignment(ExecState* exec, const String& propertyName)
 {

-    return createReferenceError(exec, makeString("Strict mode forbids implicit creation of global property '", propertyName, "'"));
-}
-
-JSObject* createOutOfMemoryError(JSGlobalObject* globalObject)
-{
-    return createError(globalObject, ASCIILiteral("Out of memory"));
+    return createReferenceError(exec, makeString("Strict mode forbids implicit creation of global property '", propertyName, '\''));

 }
 
 JSObject* throwOutOfMemoryError(ExecState* exec)
 {
 }
 
 JSObject* throwOutOfMemoryError(ExecState* exec)
 {

-    return exec->vm().throwException(exec, createOutOfMemoryError(exec->lexicalGlobalObject()));
+    return exec->vm().throwException(exec, createOutOfMemoryError(exec));

 }
 
 JSObject* throwStackOverflowError(ExecState* exec)
 }
 
 JSObject* throwStackOverflowError(ExecState* exec)