X-Git-Url: https://git.saurik.com/apple/javascriptcore.git/blobdiff_plain/6fe7ccc865dc7d7541b93c5bcaf6368d2c98a174..81345200c95645a1b0d2635520f96ad55dfde63f:/runtime/JSGlobalObjectFunctions.cpp?ds=inline diff --git a/runtime/JSGlobalObjectFunctions.cpp b/runtime/JSGlobalObjectFunctions.cpp index e8017b9..604de2b 100644 --- a/runtime/JSGlobalObjectFunctions.cpp +++ b/runtime/JSGlobalObjectFunctions.cpp @@ -27,14 +27,16 @@ #include "CallFrame.h" #include "Interpreter.h" +#include "JSFunction.h" #include "JSGlobalObject.h" #include "JSString.h" #include "JSStringBuilder.h" #include "Lexer.h" #include "LiteralParser.h" #include "Nodes.h" +#include "JSCInlines.h" #include "Parser.h" -#include "UStringBuilder.h" +#include "StackVisitor.h" #include #include #include @@ -42,6 +44,7 @@ #include #include #include +#include #include using namespace WTF; @@ -51,16 +54,16 @@ namespace JSC { static JSValue encode(ExecState* exec, const char* doNotEscape) { - CString cstr = exec->argument(0).toString(exec)->value(exec).utf8(true); + CString cstr = exec->argument(0).toString(exec)->value(exec).utf8(StrictConversion); if (!cstr.data()) - return throwError(exec, createURIError(exec, "String contained an illegal UTF-16 sequence.")); + return exec->vm().throwException(exec, createURIError(exec, ASCIILiteral("String contained an illegal UTF-16 sequence."))); JSStringBuilder builder; const char* p = cstr.data(); for (size_t k = 0; k < cstr.length(); k++, p++) { char c = *p; if (c && strchr(doNotEscape, c)) - builder.append(c); + builder.append(static_cast(c)); else { char tmp[4]; snprintf(tmp, sizeof(tmp), "%%%02X", static_cast(c)); @@ -114,7 +117,7 @@ static JSValue decode(ExecState* exec, const CharType* characters, int length, c } if (charLen == 0) { if (strict) - return throwError(exec, createURIError(exec, "URI error")); + return exec->vm().throwException(exec, createURIError(exec, ASCIILiteral("URI error"))); // The only case where we don't use "strict" mode is the "unescape" function. // For that, it's good to support the wonky "%u" syntax for compatibility with WinIE. if (k <= length - 6 && p[1] == 'u' @@ -125,10 +128,7 @@ static JSValue decode(ExecState* exec, const CharType* characters, int length, c } } if (charLen && (u == 0 || u >= 128 || !strchr(doNotUnescape, u))) { - if (u < 256) - builder.append(static_cast(u)); - else - builder.append(u); + builder.append(u); k += charLen; continue; } @@ -141,8 +141,7 @@ static JSValue decode(ExecState* exec, const CharType* characters, int length, c static JSValue decode(ExecState* exec, const char* doNotUnescape, bool strict) { - JSStringBuilder builder; - UString str = exec->argument(0).toString(exec)->value(exec); + String str = exec->argument(0).toString(exec)->value(exec); if (str.is8Bit()) return decode(exec, str.characters8(), str.length(), doNotUnescape, strict); @@ -160,12 +159,13 @@ bool isStrWhiteSpace(UChar c) case 0x000D: case 0x0020: case 0x00A0: + case 0x180E: // This character used to be in Zs category before Unicode 6.3, and EcmaScript says that we should keep treating it as such. case 0x2028: case 0x2029: case 0xFEFF: return true; default: - return c > 0xff && isSeparatorSpace(c); + return c > 0xFF && u_charType(c) == U_SPACE_SEPARATOR; } } @@ -185,7 +185,7 @@ static int parseDigit(unsigned short c, int radix) return digit; } -double parseIntOverflow(const LChar* s, int length, int radix) +double parseIntOverflow(const LChar* s, unsigned length, int radix) { double number = 0.0; double radixMultiplier = 1.0; @@ -207,7 +207,7 @@ double parseIntOverflow(const LChar* s, int length, int radix) return number; } -double parseIntOverflow(const UChar* s, int length, int radix) +static double parseIntOverflow(const UChar* s, unsigned length, int radix) { double number = 0.0; double radixMultiplier = 1.0; @@ -229,10 +229,17 @@ double parseIntOverflow(const UChar* s, int length, int radix) return number; } +static double parseIntOverflow(StringView string, int radix) +{ + if (string.is8Bit()) + return parseIntOverflow(string.characters8(), string.length(), radix); + return parseIntOverflow(string.characters16(), string.length(), radix); +} + // ES5.1 15.1.2.2 template ALWAYS_INLINE -static double parseInt(const UString& s, const CharType* data, int radix) +static double parseInt(const String& s, const CharType* data, int radix) { // 1. Let inputString be ToString(string). // 2. Let S be a newly created substring of inputString consisting of the first character that is not a @@ -275,7 +282,7 @@ static double parseInt(const UString& s, const CharType* data, int radix) // 8.a If R < 2 or R > 36, then return NaN. if (radix < 2 || radix > 36) - return std::numeric_limits::quiet_NaN(); + return PNaN; // 13. Let mathInt be the mathematical integer value that is represented by Z in radix-R notation, using the letters // A-Z and a-z for digits with values 10 through 35. (However, if R is 10 and Z contains more than 20 significant @@ -298,22 +305,22 @@ static double parseInt(const UString& s, const CharType* data, int radix) // 12. If Z is empty, return NaN. if (!sawDigit) - return std::numeric_limits::quiet_NaN(); + return PNaN; // Alternate code path for certain large numbers. if (number >= mantissaOverflowLowerBound) { if (radix == 10) { size_t parsedLength; - number = parseDouble(s.characters() + firstDigitPosition, p - firstDigitPosition, parsedLength); + number = parseDouble(StringView(s).substring(firstDigitPosition, p - firstDigitPosition), parsedLength); } else if (radix == 2 || radix == 4 || radix == 8 || radix == 16 || radix == 32) - number = parseIntOverflow(s.substringSharingImpl(firstDigitPosition, p - firstDigitPosition).utf8().data(), p - firstDigitPosition, radix); + number = parseIntOverflow(StringView(s).substring(firstDigitPosition, p - firstDigitPosition), radix); } // 15. Return sign x number. return sign * number; } -static double parseInt(const UString& s, int radix) +static double parseInt(const String& s, int radix) { if (s.is8Bit()) return parseInt(s, s.characters8(), radix); @@ -362,7 +369,7 @@ static double jsHexIntegerLiteral(const CharType*& data, const CharType* end) template static double jsStrDecimalLiteral(const CharType*& data, const CharType* end) { - ASSERT(data < end); + RELEASE_ASSERT(data < end); size_t parsedLength; double number = parseDouble(data, end - data, parsedLength); @@ -396,7 +403,7 @@ static double jsStrDecimalLiteral(const CharType*& data, const CharType* end) } // Not a number. - return std::numeric_limits::quiet_NaN(); + return PNaN; } template @@ -426,13 +433,13 @@ static double toDouble(const CharType* characters, unsigned size) break; } if (characters != endCharacters) - return std::numeric_limits::quiet_NaN(); + return PNaN; return number; } // See ecma-262 9.3.1 -double jsToNumber(const UString& s) +double jsToNumber(const String& s) { unsigned size = s.length(); @@ -442,7 +449,7 @@ double jsToNumber(const UString& s) return c - '0'; if (isStrWhiteSpace(c)) return 0; - return std::numeric_limits::quiet_NaN(); + return PNaN; } if (s.is8Bit()) @@ -450,7 +457,7 @@ double jsToNumber(const UString& s) return toDouble(s.characters16(), size); } -static double parseFloat(const UString& s) +static double parseFloat(const String& s) { unsigned size = s.length(); @@ -458,7 +465,7 @@ static double parseFloat(const UString& s) UChar c = s[0]; if (isASCIIDigit(c)) return c - '0'; - return std::numeric_limits::quiet_NaN(); + return PNaN; } if (s.is8Bit()) { @@ -473,7 +480,7 @@ static double parseFloat(const UString& s) // Empty string. if (data == end) - return std::numeric_limits::quiet_NaN(); + return PNaN; return jsStrDecimalLiteral(data, end); } @@ -489,23 +496,18 @@ static double parseFloat(const UString& s) // Empty string. if (data == end) - return std::numeric_limits::quiet_NaN(); + return PNaN; return jsStrDecimalLiteral(data, end); } EncodedJSValue JSC_HOST_CALL globalFuncEval(ExecState* exec) { - JSObject* thisObject = exec->hostThisValue().toThisObject(exec); - JSObject* unwrappedObject = thisObject->unwrappedObject(); - if (!unwrappedObject->isGlobalObject() || jsCast(unwrappedObject)->evalFunction() != exec->callee()) - return throwVMError(exec, createEvalError(exec, "The \"this\" value passed to eval must be the global object from which eval originated")); - JSValue x = exec->argument(0); if (!x.isString()) return JSValue::encode(x); - UString s = x.toString(exec)->value(exec); + String s = x.toString(exec)->value(exec); if (s.is8Bit()) { LiteralParser preparser(exec, s.characters8(), s.length(), NonStrictJSON); @@ -517,12 +519,12 @@ EncodedJSValue JSC_HOST_CALL globalFuncEval(ExecState* exec) return JSValue::encode(parsedObject); } + JSGlobalObject* calleeGlobalObject = exec->callee()->globalObject(); EvalExecutable* eval = EvalExecutable::create(exec, makeSource(s), false); - JSObject* error = eval->compile(exec, jsCast(unwrappedObject)->globalScopeChain()); - if (error) - return throwVMError(exec, error); + if (!eval) + return JSValue::encode(jsUndefined()); - return JSValue::encode(exec->interpreter()->execute(eval, exec, thisObject, jsCast(unwrappedObject)->globalScopeChain())); + return JSValue::encode(exec->interpreter()->execute(eval, exec, calleeGlobalObject->globalThis(), calleeGlobalObject)); } EncodedJSValue JSC_HOST_CALL globalFuncParseInt(ExecState* exec) @@ -548,7 +550,7 @@ EncodedJSValue JSC_HOST_CALL globalFuncParseInt(ExecState* exec) } // If ToString throws, we shouldn't call ToInt32. - UString s = value.toString(exec)->value(exec); + String s = value.toString(exec)->value(exec); if (exec->hadException()) return JSValue::encode(jsUndefined()); @@ -562,13 +564,13 @@ EncodedJSValue JSC_HOST_CALL globalFuncParseFloat(ExecState* exec) EncodedJSValue JSC_HOST_CALL globalFuncIsNaN(ExecState* exec) { - return JSValue::encode(jsBoolean(isnan(exec->argument(0).toNumber(exec)))); + return JSValue::encode(jsBoolean(std::isnan(exec->argument(0).toNumber(exec)))); } EncodedJSValue JSC_HOST_CALL globalFuncIsFinite(ExecState* exec) { double n = exec->argument(0).toNumber(exec); - return JSValue::encode(jsBoolean(isfinite(n))); + return JSValue::encode(jsBoolean(std::isfinite(n))); } EncodedJSValue JSC_HOST_CALL globalFuncDecodeURI(ExecState* exec) @@ -615,13 +617,13 @@ EncodedJSValue JSC_HOST_CALL globalFuncEscape(ExecState* exec) "*+-./@_"; JSStringBuilder builder; - UString str = exec->argument(0).toString(exec)->value(exec); + String str = exec->argument(0).toString(exec)->value(exec); if (str.is8Bit()) { const LChar* c = str.characters8(); for (unsigned k = 0; k < str.length(); k++, c++) { int u = c[0]; if (u && strchr(do_not_escape, static_cast(u))) - builder.append(c, 1); + builder.append(*c); else { char tmp[4]; snprintf(tmp, sizeof(tmp), "%%%02X", u); @@ -640,7 +642,7 @@ EncodedJSValue JSC_HOST_CALL globalFuncEscape(ExecState* exec) snprintf(tmp, sizeof(tmp), "%%u%04X", u); builder.append(tmp); } else if (u != 0 && strchr(do_not_escape, static_cast(u))) - builder.append(c, 1); + builder.append(*c); else { char tmp[4]; snprintf(tmp, sizeof(tmp), "%%%02X", u); @@ -653,8 +655,8 @@ EncodedJSValue JSC_HOST_CALL globalFuncEscape(ExecState* exec) EncodedJSValue JSC_HOST_CALL globalFuncUnescape(ExecState* exec) { - UStringBuilder builder; - UString str = exec->argument(0).toString(exec)->value(exec); + StringBuilder builder; + String str = exec->argument(0).toString(exec)->value(exec); int k = 0; int len = str.length(); @@ -699,7 +701,7 @@ EncodedJSValue JSC_HOST_CALL globalFuncUnescape(ExecState* exec) } } - return JSValue::encode(jsString(exec, builder.toUString())); + return JSValue::encode(jsString(exec, builder.toString())); } EncodedJSValue JSC_HOST_CALL globalFuncThrowTypeError(ExecState* exec) @@ -707,28 +709,89 @@ EncodedJSValue JSC_HOST_CALL globalFuncThrowTypeError(ExecState* exec) return throwVMTypeError(exec); } +class GlobalFuncProtoGetterFunctor { +public: + GlobalFuncProtoGetterFunctor(JSObject* thisObject) + : m_hasSkippedFirstFrame(false) + , m_thisObject(thisObject) + , m_result(JSValue::encode(jsUndefined())) + { + } + + EncodedJSValue result() { return m_result; } + + StackVisitor::Status operator()(StackVisitor& visitor) + { + if (!m_hasSkippedFirstFrame) { + m_hasSkippedFirstFrame = true; + return StackVisitor::Continue; + } + + if (m_thisObject->allowsAccessFrom(visitor->callFrame())) + m_result = JSValue::encode(m_thisObject->prototype()); + + return StackVisitor::Done; + } + +private: + bool m_hasSkippedFirstFrame; + JSObject* m_thisObject; + EncodedJSValue m_result; +}; + EncodedJSValue JSC_HOST_CALL globalFuncProtoGetter(ExecState* exec) { - if (!exec->thisValue().isObject()) - return JSValue::encode(exec->thisValue().synthesizePrototype(exec)); + JSObject* thisObject = jsDynamicCast(exec->thisValue().toThis(exec, NotStrictMode)); - JSObject* thisObject = asObject(exec->thisValue()); - if (!thisObject->allowsAccessFrom(exec->trueCallerFrame())) - return JSValue::encode(jsUndefined()); + if (!thisObject) + return JSValue::encode(exec->thisValue().synthesizePrototype(exec)); - return JSValue::encode(thisObject->prototype()); + GlobalFuncProtoGetterFunctor functor(thisObject); + exec->iterate(functor); + return functor.result(); } +class GlobalFuncProtoSetterFunctor { +public: + GlobalFuncProtoSetterFunctor(JSObject* thisObject) + : m_hasSkippedFirstFrame(false) + , m_allowsAccess(false) + , m_thisObject(thisObject) + { + } + + bool allowsAccess() const { return m_allowsAccess; } + + StackVisitor::Status operator()(StackVisitor& visitor) + { + if (!m_hasSkippedFirstFrame) { + m_hasSkippedFirstFrame = true; + return StackVisitor::Continue; + } + + m_allowsAccess = m_thisObject->allowsAccessFrom(visitor->callFrame()); + return StackVisitor::Done; + } + +private: + bool m_hasSkippedFirstFrame; + bool m_allowsAccess; + JSObject* m_thisObject; +}; + EncodedJSValue JSC_HOST_CALL globalFuncProtoSetter(ExecState* exec) { JSValue value = exec->argument(0); + JSObject* thisObject = jsDynamicCast(exec->thisValue().toThis(exec, NotStrictMode)); + // Setting __proto__ of a primitive should have no effect. - if (!exec->thisValue().isObject()) + if (!thisObject) return JSValue::encode(jsUndefined()); - JSObject* thisObject = asObject(exec->thisValue()); - if (!thisObject->allowsAccessFrom(exec->trueCallerFrame())) + GlobalFuncProtoSetterFunctor functor(thisObject); + exec->iterate(functor); + if (!functor.allowsAccess()) return JSValue::encode(jsUndefined()); // Setting __proto__ to a non-object, non-null value is silently ignored to match Mozilla. @@ -738,8 +801,14 @@ EncodedJSValue JSC_HOST_CALL globalFuncProtoSetter(ExecState* exec) if (!thisObject->isExtensible()) return throwVMError(exec, createTypeError(exec, StrictModeReadonlyPropertyWriteError)); - if (!thisObject->setPrototypeWithCycleCheck(exec->globalData(), value)) - throwError(exec, createError(exec, "cyclic __proto__ value")); + if (!thisObject->setPrototypeWithCycleCheck(exec, value)) + exec->vm().throwException(exec, createError(exec, "cyclic __proto__ value")); + return JSValue::encode(jsUndefined()); +} + +EncodedJSValue JSC_HOST_CALL globalFuncBuiltinLog(ExecState* exec) +{ + dataLog(exec->argument(0).toWTFString(exec), "\n"); return JSValue::encode(jsUndefined()); }