Diff
Modified: trunk/JSTests/ChangeLog (230104 => 230105)
--- trunk/JSTests/ChangeLog 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/JSTests/ChangeLog 2018-03-30 16:05:22 UTC (rev 230105)
@@ -1,3 +1,17 @@
+2018-03-30 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r230102.
+
+ Caused assertion failures on JSC bots.
+
+ Reverted changeset:
+
+ "A stack overflow in the parsing of a builtin (called by
+ createExecutable) cause a crash instead of a catchable js
+ exception"
+ https://bugs.webkit.org/show_bug.cgi?id=184074
+ https://trac.webkit.org/changeset/230102
+
2018-03-30 Robin Morisset <[email protected]>
Inlining of a function that ends in op_unreachable in a non-tail position triggers an ASSERT
Deleted: trunk/JSTests/stress/stack-overflow-while-parsing-builtin.js (230104 => 230105)
--- trunk/JSTests/stress/stack-overflow-while-parsing-builtin.js 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/JSTests/stress/stack-overflow-while-parsing-builtin.js 2018-03-30 16:05:22 UTC (rev 230105)
@@ -1,11 +0,0 @@
-function f() {
- try {
- f();
- } catch (e) {
- try {
- Map.prototype.forEach.call('', {});
- } catch {}
- }
-}
-
-f()
Modified: trunk/Source/_javascript_Core/ChangeLog (230104 => 230105)
--- trunk/Source/_javascript_Core/ChangeLog 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-03-30 16:05:22 UTC (rev 230105)
@@ -1,3 +1,17 @@
+2018-03-30 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r230102.
+
+ Caused assertion failures on JSC bots.
+
+ Reverted changeset:
+
+ "A stack overflow in the parsing of a builtin (called by
+ createExecutable) cause a crash instead of a catchable js
+ exception"
+ https://bugs.webkit.org/show_bug.cgi?id=184074
+ https://trac.webkit.org/changeset/230102
+
2018-03-30 Robin Morisset <[email protected]>
Inlining of a function that ends in op_unreachable in a non-tail position triggers an ASSERT
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (230104 => 230105)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2018-03-30 16:05:22 UTC (rev 230105)
@@ -1675,6 +1675,7 @@
DCF3D56D1CD29476003D5C65 /* LazyPropertyInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF3D5681CD29468003D5C65 /* LazyPropertyInlines.h */; };
DCFDFBD91D1F5D9B00FE3D72 /* B3BottomProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFDFBD71D1F5D9800FE3D72 /* B3BottomProvider.h */; };
DCFDFBDA1D1F5D9E00FE3D72 /* B3TypeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = DCFDFBD81D1F5D9800FE3D72 /* B3TypeMap.h */; };
+ DE26E9031CB5DD0500D2BE82 /* BuiltinExecutableCreator.h in Headers */ = {isa = PBXBuildFile; fileRef = DE26E9021CB5DD0500D2BE82 /* BuiltinExecutableCreator.h */; };
DEA7E2451BBC677F00D78440 /* JSTypedArrayViewPrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = 53917E7C1B791106000EBD33 /* JSTypedArrayViewPrototype.h */; settings = {ATTRIBUTES = (Private, ); }; };
E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */ = {isa = PBXBuildFile; fileRef = E124A8F50E555775003091F1 /* OpaqueJSString.h */; settings = {ATTRIBUTES = (Private, ); }; };
E31618131EC5FE170006A218 /* DOMAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = E31618101EC5FE080006A218 /* DOMAnnotation.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3161,7 +3162,6 @@
1CAA8B4A0D32C39A0041BCFF /* _javascript_.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _javascript_.h; sourceTree = "<group>"; };
1CAA8B4B0D32C39A0041BCFF /* _javascript_Core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _javascript_Core.h; sourceTree = "<group>"; };
20ECB15EFC524624BC2F02D5 /* ModuleNamespaceAccessCase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleNamespaceAccessCase.cpp; sourceTree = "<group>"; };
- 220C60C6206CEABD00FC4637 /* ParserError.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ParserError.cpp; sourceTree = "<group>"; };
2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringJoiner.cpp; sourceTree = "<group>"; };
2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringJoiner.h; sourceTree = "<group>"; };
262D85B41C0D650F006ACB61 /* AirFixPartialRegisterStalls.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AirFixPartialRegisterStalls.cpp; path = b3/air/AirFixPartialRegisterStalls.cpp; sourceTree = "<group>"; };
@@ -4513,6 +4513,8 @@
DCF3D5681CD29468003D5C65 /* LazyPropertyInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LazyPropertyInlines.h; sourceTree = "<group>"; };
DCFDFBD71D1F5D9800FE3D72 /* B3BottomProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3BottomProvider.h; path = b3/B3BottomProvider.h; sourceTree = "<group>"; };
DCFDFBD81D1F5D9800FE3D72 /* B3TypeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = B3TypeMap.h; path = b3/B3TypeMap.h; sourceTree = "<group>"; };
+ DE26E9021CB5DD0500D2BE82 /* BuiltinExecutableCreator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BuiltinExecutableCreator.h; sourceTree = "<group>"; };
+ DE26E9061CB5DD9600D2BE82 /* BuiltinExecutableCreator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltinExecutableCreator.cpp; sourceTree = "<group>"; };
DE5A09FF1BA3AC3E003D4424 /* IntrinsicEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntrinsicEmitter.cpp; sourceTree = "<group>"; };
E124A8F50E555775003091F1 /* OpaqueJSString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpaqueJSString.h; sourceTree = "<group>"; };
E124A8F60E555775003091F1 /* OpaqueJSString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpaqueJSString.cpp; sourceTree = "<group>"; };
@@ -6362,7 +6364,6 @@
93F0B3AA09BB4DC00068FCE3 /* Parser.h */,
93052C320FB792190048FDC3 /* ParserArena.cpp */,
93052C330FB792190048FDC3 /* ParserArena.h */,
- 220C60C6206CEABD00FC4637 /* ParserError.cpp */,
0FCCAE4316D0CF6E00D0C65B /* ParserError.h */,
9B4954E81A6640DB002815A6 /* ParserFunctionInfo.h */,
A77F18241641925400640A47 /* ParserModes.h */,
@@ -7917,6 +7918,8 @@
5B8243041DB7AA4900EA6384 /* AsyncFunctionPrototype.js */,
8BC064821E180B4A00B2B8CA /* AsyncGeneratorPrototype.js */,
8BC064951E1D838B00B2B8CA /* AsyncIteratorPrototype.js */,
+ DE26E9061CB5DD9600D2BE82 /* BuiltinExecutableCreator.cpp */,
+ DE26E9021CB5DD0500D2BE82 /* BuiltinExecutableCreator.h */,
A7D801A11880D66E0026C39B /* BuiltinExecutables.cpp */,
A7D801A21880D66E0026C39B /* BuiltinExecutables.h */,
E380D66B1F19249D00A59095 /* BuiltinNames.cpp */,
@@ -8348,6 +8351,7 @@
9B4694391F97439E00CCB3F9 /* BooleanPrototype.h in Headers */,
996B73191BDA068000331B84 /* BooleanPrototype.lut.h in Headers */,
FEA08620182B7A0400F6D851 /* Breakpoint.h in Headers */,
+ DE26E9031CB5DD0500D2BE82 /* BuiltinExecutableCreator.h in Headers */,
A7D801A51880D66E0026C39B /* BuiltinExecutables.h in Headers */,
A75EE9B218AAB7E200AAD043 /* BuiltinNames.h in Headers */,
99DA00A61BD5993100F4575C /* builtins.py in Headers */,
@@ -9040,6 +9044,7 @@
A503FA1E188E0FB000110F14 /* JSJavaScriptCallFramePrototype.h in Headers */,
7013CA8C1B491A9400CAE613 /* JSJob.h in Headers */,
BC18C4160E16F5CD00B34460 /* JSLexicalEnvironment.h in Headers */,
+ 7A9774A8206B82E4008D03D0 /* JSWeakValue.h in Headers */,
BC18C4230E16F5CD00B34460 /* JSLock.h in Headers */,
C25D709C16DE99F400FCA6BC /* JSManagedValue.h in Headers */,
2A4BB7F318A41179008A0FCD /* JSManagedValueInternal.h in Headers */,
@@ -9111,7 +9116,6 @@
A7482B9311671147003B0712 /* JSWeakObjectMapRefPrivate.h in Headers */,
0F0B286B1EB8E6CF000EB5D2 /* JSWeakPrivate.h in Headers */,
709FB8681AE335C60039D069 /* JSWeakSet.h in Headers */,
- 7A9774A8206B82E4008D03D0 /* JSWeakValue.h in Headers */,
AD5C36EB1F75AD73000BCAAF /* JSWebAssembly.h in Headers */,
AD9E852F1E8A0C7C008DE39E /* JSWebAssemblyCodeBlock.h in Headers */,
79EFD4841EBC045C00F3DFEA /* JSWebAssemblyCodeBlockHeapCellType.h in Headers */,
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_combined_header.py (230104 => 230105)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_combined_header.py 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_combined_header.py 2018-03-30 16:05:22 UTC (rev 230105)
@@ -66,17 +66,12 @@
return "\n\n".join(sections)
def generate_forward_declarations(self):
- return """
-#include <wtf/Expected.h>
-
-namespace JSC {
+ return """namespace JSC {
class FunctionExecutable;
class VM;
-class ParserError;
enum class ConstructAbility : unsigned;
-}
-"""
+}"""
def generate_section_for_object(self, object):
lines = []
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py (230104 => 230105)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_generate_separate_header.py 2018-03-30 16:05:22 UTC (rev 230105)
@@ -93,10 +93,6 @@
),
(["WebCore"],
- ("_javascript_Core", "parser/ParserError.h"),
- ),
-
- (["WebCore"],
("_javascript_Core", "builtins/BuiltinUtils.h"),
),
Modified: trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py (230104 => 230105)
--- trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/Scripts/builtins/builtins_templates.py 2018-03-30 16:05:22 UTC (rev 230105)
@@ -68,7 +68,7 @@
CombinedHeaderStaticMacros = (
"""#define DECLARE_BUILTIN_GENERATOR(codeName, functionName, overriddenName, argumentCount) \\
- Expected<JSC::FunctionExecutable*, JSC::ParserError> codeName##Generator(JSC::VM&);
+ JSC::FunctionExecutable* codeName##Generator(JSC::VM&);
${macroPrefix}_FOREACH_BUILTIN_CODE(DECLARE_BUILTIN_GENERATOR)
#undef DECLARE_BUILTIN_GENERATOR""")
@@ -75,7 +75,7 @@
SeparateHeaderStaticMacros = (
"""#define DECLARE_BUILTIN_GENERATOR(codeName, functionName, overriddenName, argumentCount) \\
- Expected<JSC::FunctionExecutable*, JSC::ParserError> codeName##Generator(JSC::VM&);
+ JSC::FunctionExecutable* codeName##Generator(JSC::VM&);
${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(DECLARE_BUILTIN_GENERATOR)
#undef DECLARE_BUILTIN_GENERATOR""")
@@ -83,12 +83,9 @@
CombinedJSCImplementationStaticMacros = (
"""
#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, overriddenName, argumentCount) \\
-Expected<JSC::FunctionExecutable*, JSC::ParserError> codeName##Generator(JSC::VM& vm) \\
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
{\\
- auto expectedUnlinked = vm.builtinExecutables()->codeName##Executable();\\
- if (!expectedUnlinked.has_value())\\
- return makeUnexpected(expectedUnlinked.error());\\
- return expectedUnlinked.value()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic);\\
+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
}
${macroPrefix}_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
#undef DEFINE_BUILTIN_GENERATOR
@@ -97,12 +94,9 @@
SeparateJSCImplementationStaticMacros = (
"""
#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, overriddenName, argumentCount) \\
-Expected<JSC::FunctionExecutable*, JSC::ParserError> codeName##Generator(JSC::VM& vm) \\
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
{\\
- auto expectedUnlinked = vm.builtinExecutables()->codeName##Executable();\\
- if (!expectedUnlinked.has_value())\\
- return makeUnexpected(expectedUnlinked.error());\\
- return expectedUnlinked.value()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic);\\
+ return vm.builtinExecutables()->codeName##Executable()->link(vm, vm.builtinExecutables()->codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \
}
${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
#undef DEFINE_BUILTIN_GENERATOR
@@ -111,10 +105,10 @@
CombinedWebCoreImplementationStaticMacros = (
"""
#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, overriddenName, argumentCount) \\
-Expected<JSC::FunctionExecutable*, JSC::ParserError> codeName##Generator(JSC::VM& vm) \\
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
{\\
JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \\
- return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable().value()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \\
+ return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \\
}
${macroPrefix}_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
#undef DEFINE_BUILTIN_GENERATOR
@@ -123,10 +117,10 @@
SeparateWebCoreImplementationStaticMacros = (
"""
#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, overriddenName, argumentCount) \\
-Expected<JSC::FunctionExecutable*, JSC::ParserError> codeName##Generator(JSC::VM& vm) \\
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \\
{\\
JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \\
- return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable().value()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \\
+ return clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Executable()->link(vm, clientData->builtinFunctions().${objectNameLC}Builtins().codeName##Source(), std::nullopt, s_##codeName##Intrinsic); \\
}
${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
#undef DEFINE_BUILTIN_GENERATOR
@@ -145,7 +139,7 @@
}
#define EXPOSE_BUILTIN_EXECUTABLES(name, functionName, overriddenName, length) \\
-Expected<JSC::UnlinkedFunctionExecutable*, JSC::ParserError> name##Executable(); \\
+ JSC::UnlinkedFunctionExecutable* name##Executable(); \\
const JSC::SourceCode& name##Source() const { return m_##name##Source; }
${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(EXPOSE_BUILTIN_EXECUTABLES)
#undef EXPOSE_BUILTIN_EXECUTABLES
@@ -168,7 +162,7 @@
};
#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, overriddenName, length) \\
-inline Expected<JSC::UnlinkedFunctionExecutable*, JSC::ParserError> ${objectName}BuiltinsWrapper::name##Executable() \\
+inline JSC::UnlinkedFunctionExecutable* ${objectName}BuiltinsWrapper::name##Executable() \\
{\\
if (!m_##name##Executable) {\\
JSC::Identifier executableName = functionName##PublicName();\\
@@ -208,7 +202,7 @@
inline void ${objectName}BuiltinFunctions::init(JSC::JSGlobalObject& globalObject)
{
#define EXPORT_FUNCTION(codeName, functionName, overriddenName, length)\\
- m_##functionName##Function.set(m_vm, &globalObject, JSC::JSFunction::create(m_vm, codeName##Generator(m_vm).value(), &globalObject));
+ m_##functionName##Function.set(m_vm, &globalObject, JSC::JSFunction::create(m_vm, codeName##Generator(m_vm), &globalObject));
${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(EXPORT_FUNCTION)
#undef EXPORT_FUNCTION
}
Modified: trunk/Source/_javascript_Core/Sources.txt (230104 => 230105)
--- trunk/Source/_javascript_Core/Sources.txt 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/Sources.txt 2018-03-30 16:05:22 UTC (rev 230105)
@@ -179,6 +179,7 @@
bindings/ScriptValue.cpp
builtins/BuiltinExecutables.cpp
+builtins/BuiltinExecutableCreator.cpp
builtins/BuiltinNames.cpp
bytecode/AccessCase.cpp
@@ -653,7 +654,6 @@
parser/NodesAnalyzeModule.cpp
parser/Parser.cpp
parser/ParserArena.cpp
-parser/ParserError.cpp
parser/SourceProvider.cpp
parser/SourceProviderCache.cpp
parser/UnlinkedSourceCode.cpp
Copied: trunk/Source/_javascript_Core/builtins/BuiltinExecutableCreator.cpp (from rev 230104, trunk/Source/_javascript_Core/runtime/AsyncIteratorPrototype.cpp) (0 => 230105)
--- trunk/Source/_javascript_Core/builtins/BuiltinExecutableCreator.cpp (rev 0)
+++ trunk/Source/_javascript_Core/builtins/BuiltinExecutableCreator.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "BuiltinExecutableCreator.h"
+
+#include "BuiltinExecutables.h"
+
+namespace JSC {
+
+UnlinkedFunctionExecutable* createBuiltinExecutable(VM& vm, const SourceCode& source, const Identifier& ident, ConstructorKind kind, ConstructAbility ability)
+{
+ return BuiltinExecutables::createExecutable(vm, source, ident, kind, ability);
+}
+
+} // namespace JSC
Copied: trunk/Source/_javascript_Core/builtins/BuiltinExecutableCreator.h (from rev 230104, trunk/Source/_javascript_Core/runtime/AsyncIteratorPrototype.cpp) (0 => 230105)
--- trunk/Source/_javascript_Core/builtins/BuiltinExecutableCreator.h (rev 0)
+++ trunk/Source/_javascript_Core/builtins/BuiltinExecutableCreator.h 2018-03-30 16:05:22 UTC (rev 230105)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "ConstructAbility.h"
+#include "ParserModes.h"
+#include "SourceCode.h"
+
+namespace JSC {
+
+JS_EXPORT_PRIVATE UnlinkedFunctionExecutable* createBuiltinExecutable(VM&, const SourceCode&, const Identifier&, ConstructorKind, ConstructAbility);
+
+} // namespace JSC
Modified: trunk/Source/_javascript_Core/builtins/BuiltinExecutables.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/builtins/BuiltinExecutables.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/builtins/BuiltinExecutables.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -30,7 +30,6 @@
#include "BuiltinNames.h"
#include "JSCInlines.h"
#include "Parser.h"
-#include <wtf/Expected.h>
#include <wtf/NeverDestroyed.h>
namespace JSC {
@@ -52,14 +51,15 @@
case ConstructorKind::None:
break;
case ConstructorKind::Base:
- return createExecutableOrCrash(m_vm, makeSource(baseConstructorCode, { }), name, constructorKind, ConstructAbility::CanConstruct);
+ return createExecutable(m_vm, makeSource(baseConstructorCode, { }), name, constructorKind, ConstructAbility::CanConstruct);
case ConstructorKind::Extends:
- return createExecutableOrCrash(m_vm, makeSource(derivedConstructorCode, { }), name, constructorKind, ConstructAbility::CanConstruct);
+ return createExecutable(m_vm, makeSource(derivedConstructorCode, { }), name, constructorKind, ConstructAbility::CanConstruct);
}
- RELEASE_ASSERT_NOT_REACHED();
+ ASSERT_NOT_REACHED();
+ return nullptr;
}
-ExpectedUnlinkedFunctionExecutable BuiltinExecutables::createBuiltinExecutable(const SourceCode& code, const Identifier& name, ConstructAbility constructAbility)
+UnlinkedFunctionExecutable* BuiltinExecutables::createBuiltinExecutable(const SourceCode& code, const Identifier& name, ConstructAbility constructAbility)
{
return createExecutable(m_vm, code, name, ConstructorKind::None, constructAbility);
}
@@ -66,21 +66,11 @@
UnlinkedFunctionExecutable* createBuiltinExecutable(VM& vm, const SourceCode& code, const Identifier& name, ConstructAbility constructAbility)
{
- return BuiltinExecutables::createExecutableOrCrash(vm, code, name, ConstructorKind::None, constructAbility);
+ return BuiltinExecutables::createExecutable(vm, code, name, ConstructorKind::None, constructAbility);
}
-UnlinkedFunctionExecutable* BuiltinExecutables::createExecutableOrCrash(VM& vm, const SourceCode& source, const Identifier& name, ConstructorKind constructorKind, ConstructAbility constructAbility)
+UnlinkedFunctionExecutable* BuiltinExecutables::createExecutable(VM& vm, const SourceCode& source, const Identifier& name, ConstructorKind constructorKind, ConstructAbility constructAbility)
{
- auto expected = BuiltinExecutables::createExecutable(vm, source, name, constructorKind, constructAbility);
- if (!expected.has_value()) {
- dataLogLn("Fatal error compiling builtin function '", name.string(), "'");
- CRASH();
- }
- return expected.value();
-}
-
-ExpectedUnlinkedFunctionExecutable BuiltinExecutables::createExecutable(VM& vm, const SourceCode& source, const Identifier& name, ConstructorKind constructorKind, ConstructAbility constructAbility)
-{
JSTextPosition positionBeforeLastNewline;
ParserError error;
bool isParsingDefaultConstructor = constructorKind != ConstructorKind::None;
@@ -93,8 +83,8 @@
&positionBeforeLastNewline, constructorKind);
if (!program) {
- RELEASE_ASSERT(error.isValid());
- return makeUnexpected(WTFMove(error));
+ dataLog("Fatal error compiling builtin function '", name.string(), "': ", error.message());
+ CRASH();
}
StatementNode* exprStatement = program->singleStatement();
@@ -116,7 +106,7 @@
metadata->overrideName(name);
VariableEnvironment dummyTDZVariables;
UnlinkedFunctionExecutable* functionExecutable = UnlinkedFunctionExecutable::create(&vm, source, metadata, kind, constructAbility, JSParserScriptMode::Classic, dummyTDZVariables, DerivedContextType::None, WTFMove(parentSourceOverride));
- return ExpectedUnlinkedFunctionExecutable(functionExecutable);
+ return functionExecutable;
}
void BuiltinExecutables::finalize(Handle<Unknown>, void* context)
@@ -125,18 +115,15 @@
}
#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, overrideName, length) \
-ExpectedUnlinkedFunctionExecutable BuiltinExecutables::name##Executable() \
+UnlinkedFunctionExecutable* BuiltinExecutables::name##Executable() \
{\
if (!m_##name##Executable) {\
Identifier executableName = m_vm.propertyNames->builtinNames().functionName##PublicName();\
if (overrideName)\
executableName = Identifier::fromString(&m_vm, overrideName);\
- ExpectedUnlinkedFunctionExecutable f = createBuiltinExecutable(m_##name##Source, executableName, s_##name##ConstructAbility);\
- if (!f.has_value())\
- return f;\
- m_##name##Executable = Weak<UnlinkedFunctionExecutable>(f.value(), this, &m_##name##Executable);\
+ m_##name##Executable = Weak<UnlinkedFunctionExecutable>(createBuiltinExecutable(m_##name##Source, executableName, s_##name##ConstructAbility), this, &m_##name##Executable);\
}\
- return ExpectedUnlinkedFunctionExecutable(m_##name##Executable.get());\
+ return m_##name##Executable.get();\
}
JSC_FOREACH_BUILTIN_CODE(DEFINE_BUILTIN_EXECUTABLES)
#undef EXPOSE_BUILTIN_SOURCES
Modified: trunk/Source/_javascript_Core/builtins/BuiltinExecutables.h (230104 => 230105)
--- trunk/Source/_javascript_Core/builtins/BuiltinExecutables.h 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/builtins/BuiltinExecutables.h 2018-03-30 16:05:22 UTC (rev 230105)
@@ -26,11 +26,10 @@
#pragma once
#include "JSCBuiltins.h"
-#include "Parser.h"
+#include "ParserModes.h"
#include "SourceCode.h"
#include "Weak.h"
#include "WeakHandleOwner.h"
-#include <wtf/Expected.h>
namespace JSC {
@@ -38,8 +37,6 @@
class Identifier;
class VM;
-using ExpectedUnlinkedFunctionExecutable = Expected<UnlinkedFunctionExecutable*, ParserError>;
-
class BuiltinExecutables final: private WeakHandleOwner {
WTF_MAKE_FAST_ALLOCATED;
public:
@@ -46,7 +43,7 @@
explicit BuiltinExecutables(VM&);
#define EXPOSE_BUILTIN_EXECUTABLES(name, functionName, overriddenName, length) \
-ExpectedUnlinkedFunctionExecutable name##Executable(); \
+UnlinkedFunctionExecutable* name##Executable(); \
const SourceCode& name##Source() { return m_##name##Source; }
JSC_FOREACH_BUILTIN_CODE(EXPOSE_BUILTIN_EXECUTABLES)
@@ -54,14 +51,13 @@
UnlinkedFunctionExecutable* createDefaultConstructor(ConstructorKind, const Identifier& name);
- static ExpectedUnlinkedFunctionExecutable createExecutable(VM&, const SourceCode&, const Identifier&, ConstructorKind, ConstructAbility);
- static UnlinkedFunctionExecutable* createExecutableOrCrash(VM&, const SourceCode&, const Identifier&, ConstructorKind, ConstructAbility);
+ static UnlinkedFunctionExecutable* createExecutable(VM&, const SourceCode&, const Identifier&, ConstructorKind, ConstructAbility);
private:
void finalize(Handle<Unknown>, void* context) override;
VM& m_vm;
- ExpectedUnlinkedFunctionExecutable createBuiltinExecutable(const SourceCode&, const Identifier&, ConstructAbility);
+ UnlinkedFunctionExecutable* createBuiltinExecutable(const SourceCode&, const Identifier&, ConstructAbility);
#define DECLARE_BUILTIN_SOURCE_MEMBERS(name, functionName, overriddenName, length)\
SourceCode m_##name##Source; \
Modified: trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h (230104 => 230105)
--- trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/bytecompiler/BytecodeGenerator.h 2018-03-30 16:05:22 UTC (rev 230105)
@@ -31,7 +31,6 @@
#pragma once
#include "CodeBlock.h"
-#include "Error.h"
#include "Instruction.h"
#include "Interpreter.h"
#include "JSAsyncGeneratorFunction.h"
Deleted: trunk/Source/_javascript_Core/parser/ParserError.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/parser/ParserError.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/parser/ParserError.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2018 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ParserError.h"
-
-#include "ErrorHandlingScope.h"
-#include "ExceptionHelpers.h"
-#include "HeapCellInlines.h"
-#include <wtf/text/WTFString.h>
-
-namespace JSC {
-JSObject* ParserError::toErrorObject(JSGlobalObject* globalObject, const SourceCode& source, int overrideLineNumber)
-{
- ExecState* exec = globalObject->globalExec();
- switch (m_type) {
- case ErrorNone:
- return nullptr;
- case SyntaxError: {
- auto syntaxError = createSyntaxError(exec, m_message);
- auto line = overrideLineNumber == -1 ? m_line : overrideLineNumber;
- return addErrorInfo(exec, syntaxError, line, source);
- }
- case EvalError:
- return createSyntaxError(exec, m_message);
- case StackOverflow: {
- ErrorHandlingScope errorScope(globalObject->vm());
- return createStackOverflowError(exec);
- }
- case OutOfMemory:
- return createOutOfMemoryError(exec);
- }
- RELEASE_ASSERT_NOT_REACHED();
-}
-
-JSObject* ParserError::throwStackOverflowOrOutOfMemory(ExecState* exec)
-{
- VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
-
- switch (m_type) {
- case ErrorNone:
- case EvalError:
- case SyntaxError:
- RELEASE_ASSERT_NOT_REACHED();
- case StackOverflow:
- return throwStackOverflowError(exec, scope);
- case OutOfMemory:
- return throwOutOfMemoryError(exec, scope);
- }
- RELEASE_ASSERT_NOT_REACHED();
-}
-} // namespace JSC
-
-namespace WTF {
-void printInternal(PrintStream& out, JSC::ParserError::SyntaxErrorType type)
-{
- switch (type) {
- case JSC::ParserError::SyntaxErrorNone:
- out.print("SyntaxErrorNone");
- return;
- case JSC::ParserError::SyntaxErrorIrrecoverable:
- out.print("SyntaxErrorIrrecoverable");
- return;
- case JSC::ParserError::SyntaxErrorUnterminatedLiteral:
- out.print("SyntaxErrorUnterminatedLiteral");
- return;
- case JSC::ParserError::SyntaxErrorRecoverable:
- out.print("SyntaxErrorRecoverable");
- return;
- }
- RELEASE_ASSERT_NOT_REACHED();
-}
-
-void printInternal(PrintStream& out, JSC::ParserError::ErrorType type)
-{
- switch (type) {
- case JSC::ParserError::ErrorNone:
- out.print("ErrorNone");
- return;
- case JSC::ParserError::StackOverflow:
- out.print("StackOverflow");
- return;
- case JSC::ParserError::EvalError:
- out.print("EvalError");
- return;
- case JSC::ParserError::OutOfMemory:
- out.print("OutOfMemory");
- return;
- case JSC::ParserError::SyntaxError:
- out.print("SyntaxError");
- return;
- }
- RELEASE_ASSERT_NOT_REACHED();
-}
-} // namespace WTF
Modified: trunk/Source/_javascript_Core/parser/ParserError.h (230104 => 230105)
--- trunk/Source/_javascript_Core/parser/ParserError.h 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/parser/ParserError.h 2018-03-30 16:05:22 UTC (rev 230105)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2018 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2013 Apple Inc. All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -25,6 +25,9 @@
#pragma once
+#include "Error.h"
+#include "ErrorHandlingScope.h"
+#include "ExceptionHelpers.h"
#include "ParserTokens.h"
#include <wtf/text/WTFString.h>
@@ -81,8 +84,31 @@
const String& message() const { return m_message; }
int line() const { return m_line; }
- JSObject* toErrorObject(JSGlobalObject*, const SourceCode&, int overrideLineNumber = -1);
- JS_EXPORT_PRIVATE JSObject* throwStackOverflowOrOutOfMemory(ExecState* = nullptr);
+ JSObject* toErrorObject(
+ JSGlobalObject* globalObject, const SourceCode& source,
+ int overrideLineNumber = -1)
+ {
+ ExecState* exec = globalObject->globalExec();
+ switch (m_type) {
+ case ErrorNone:
+ return nullptr;
+ case SyntaxError:
+ return addErrorInfo(
+ exec,
+ createSyntaxError(exec, m_message),
+ overrideLineNumber == -1 ? m_line : overrideLineNumber, source);
+ case EvalError:
+ return createSyntaxError(exec, m_message);
+ case StackOverflow: {
+ ErrorHandlingScope errorScope(globalObject->vm());
+ return createStackOverflowError(exec);
+ }
+ case OutOfMemory:
+ return createOutOfMemoryError(exec);
+ }
+ CRASH();
+ return nullptr;
+ }
private:
JSToken m_token;
@@ -95,6 +121,48 @@
} // namespace JSC
namespace WTF {
-void printInternal(PrintStream&, JSC::ParserError::SyntaxErrorType);
-void printInternal(PrintStream&, JSC::ParserError::ErrorType);
+
+inline void printInternal(PrintStream& out, JSC::ParserError::SyntaxErrorType type)
+{
+ switch (type) {
+ case JSC::ParserError::SyntaxErrorNone:
+ out.print("SyntaxErrorNone");
+ return;
+ case JSC::ParserError::SyntaxErrorIrrecoverable:
+ out.print("SyntaxErrorIrrecoverable");
+ return;
+ case JSC::ParserError::SyntaxErrorUnterminatedLiteral:
+ out.print("SyntaxErrorUnterminatedLiteral");
+ return;
+ case JSC::ParserError::SyntaxErrorRecoverable:
+ out.print("SyntaxErrorRecoverable");
+ return;
+ }
+
+ RELEASE_ASSERT_NOT_REACHED();
+}
+
+inline void printInternal(PrintStream& out, JSC::ParserError::ErrorType type)
+{
+ switch (type) {
+ case JSC::ParserError::ErrorNone:
+ out.print("ErrorNone");
+ return;
+ case JSC::ParserError::StackOverflow:
+ out.print("StackOverflow");
+ return;
+ case JSC::ParserError::EvalError:
+ out.print("EvalError");
+ return;
+ case JSC::ParserError::OutOfMemory:
+ out.print("OutOfMemory");
+ return;
+ case JSC::ParserError::SyntaxError:
+ out.print("SyntaxError");
+ return;
+ }
+
+ RELEASE_ASSERT_NOT_REACHED();
+}
+
} // namespace WTF
Modified: trunk/Source/_javascript_Core/runtime/AsyncIteratorPrototype.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/AsyncIteratorPrototype.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/AsyncIteratorPrototype.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -41,7 +41,7 @@
ASSERT(inherits(vm, info()));
didBecomePrototype();
- JSFunction* asyncIteratorPrototypeFunction = JSFunction::create(vm, asyncIteratorPrototypeSymbolAsyncIteratorGetterCodeGenerator(vm).value(), globalObject);
+ JSFunction* asyncIteratorPrototypeFunction = JSFunction::create(vm, asyncIteratorPrototypeSymbolAsyncIteratorGetterCodeGenerator(vm), globalObject);
putDirectWithoutTransition(vm, vm.propertyNames->asyncIteratorSymbol, asyncIteratorPrototypeFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
}
Modified: trunk/Source/_javascript_Core/runtime/FunctionPrototype.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/FunctionPrototype.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/FunctionPrototype.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -63,11 +63,11 @@
JSFunction* toStringFunction = JSFunction::create(vm, globalObject, 0, vm.propertyNames->toString.string(), functionProtoFuncToString);
putDirectWithoutTransition(vm, vm.propertyNames->toString, toStringFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
- *applyFunction = putDirectBuiltinFunctionWithoutTransition(vm, globalObject, vm.propertyNames->builtinNames().applyPublicName(), functionPrototypeApplyCodeGenerator(vm).value(), static_cast<unsigned>(PropertyAttribute::DontEnum));
- *callFunction = putDirectBuiltinFunctionWithoutTransition(vm, globalObject, vm.propertyNames->builtinNames().callPublicName(), functionPrototypeCallCodeGenerator(vm).value(), static_cast<unsigned>(PropertyAttribute::DontEnum));
- putDirectBuiltinFunctionWithoutTransition(vm, globalObject, vm.propertyNames->bind, functionPrototypeBindCodeGenerator(vm).value(), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ *applyFunction = putDirectBuiltinFunctionWithoutTransition(vm, globalObject, vm.propertyNames->builtinNames().applyPublicName(), functionPrototypeApplyCodeGenerator(vm), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ *callFunction = putDirectBuiltinFunctionWithoutTransition(vm, globalObject, vm.propertyNames->builtinNames().callPublicName(), functionPrototypeCallCodeGenerator(vm), static_cast<unsigned>(PropertyAttribute::DontEnum));
+ putDirectBuiltinFunctionWithoutTransition(vm, globalObject, vm.propertyNames->bind, functionPrototypeBindCodeGenerator(vm), static_cast<unsigned>(PropertyAttribute::DontEnum));
- *hasInstanceSymbolFunction = JSFunction::create(vm, functionPrototypeSymbolHasInstanceCodeGenerator(vm).value(), globalObject);
+ *hasInstanceSymbolFunction = JSFunction::create(vm, functionPrototypeSymbolHasInstanceCodeGenerator(vm), globalObject);
putDirectWithoutTransition(vm, vm.propertyNames->hasInstanceSymbol, *hasInstanceSymbolFunction, PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly | PropertyAttribute::DontEnum);
}
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObject.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -443,24 +443,24 @@
});
m_arrayProtoValuesFunction.initLater(
[] (const Initializer<JSFunction>& init) {
- init.set(JSFunction::create(init.vm, arrayPrototypeValuesCodeGenerator(init.vm).value(), init.owner));
+ init.set(JSFunction::create(init.vm, arrayPrototypeValuesCodeGenerator(init.vm), init.owner));
});
m_initializePromiseFunction.initLater(
[] (const Initializer<JSFunction>& init) {
- init.set(JSFunction::create(init.vm, promiseOperationsInitializePromiseCodeGenerator(init.vm).value(), init.owner));
+ init.set(JSFunction::create(init.vm, promiseOperationsInitializePromiseCodeGenerator(init.vm), init.owner));
});
m_iteratorProtocolFunction.initLater(
[] (const Initializer<JSFunction>& init) {
- init.set(JSFunction::create(init.vm, iteratorHelpersPerformIterationCodeGenerator(init.vm).value(), init.owner));
+ init.set(JSFunction::create(init.vm, iteratorHelpersPerformIterationCodeGenerator(init.vm), init.owner));
});
m_promiseResolveFunction.initLater(
[] (const Initializer<JSFunction>& init) {
- init.set(JSFunction::create(init.vm, promiseConstructorResolveCodeGenerator(init.vm).value(), init.owner));
+ init.set(JSFunction::create(init.vm, promiseConstructorResolveCodeGenerator(init.vm), init.owner));
});
- m_newPromiseCapabilityFunction.set(vm, this, JSFunction::create(vm, promiseOperationsNewPromiseCapabilityCodeGenerator(vm).value(), this));
+ m_newPromiseCapabilityFunction.set(vm, this, JSFunction::create(vm, promiseOperationsNewPromiseCapabilityCodeGenerator(vm), this));
m_functionProtoHasInstanceSymbolFunction.set(vm, this, hasInstanceSymbolFunction);
m_throwTypeErrorGetterSetter.initLater(
[] (const Initializer<GetterSetter>& init) {
@@ -491,7 +491,7 @@
m_functionPrototype->initRestrictedProperties(exec, this);
m_speciesGetterSetter.set(vm, this, GetterSetter::create(vm, this));
- m_speciesGetterSetter->setGetter(vm, this, JSFunction::create(vm, globalOperationsSpeciesGetterCodeGenerator(vm).value(), this));
+ m_speciesGetterSetter->setGetter(vm, this, JSFunction::create(vm, globalOperationsSpeciesGetterCodeGenerator(vm), this));
m_typedArrayProto.initLater(
[] (const Initializer<JSTypedArrayViewPrototype>& init) {
@@ -513,7 +513,7 @@
[] (LazyClassStructure::Initializer& init) { \
init.setPrototype(JS ## type ## ArrayPrototype::create(init.vm, init.global, JS ## type ## ArrayPrototype::createStructure(init.vm, init.global, init.global->m_typedArrayProto.get(init.global)))); \
init.setStructure(JS ## type ## Array::createStructure(init.vm, init.global, init.prototype)); \
- init.setConstructor(JS ## type ## ArrayConstructor::create(init.vm, init.global, JS ## type ## ArrayConstructor::createStructure(init.vm, init.global, init.global->m_typedArraySuperConstructor.get(init.global)), init.prototype, ASCIILiteral(#type "Array"), typedArrayConstructorAllocate ## type ## ArrayCodeGenerator(init.vm).value())); \
+ init.setConstructor(JS ## type ## ArrayConstructor::create(init.vm, init.global, JS ## type ## ArrayConstructor::createStructure(init.vm, init.global, init.global->m_typedArraySuperConstructor.get(init.global)), init.prototype, ASCIILiteral(#type "Array"), typedArrayConstructorAllocate ## type ## ArrayCodeGenerator(init.vm))); \
init.global->putDirectWithoutTransition(init.vm, init.vm.propertyNames->builtinNames().type ## ArrayPrivateName(), init.constructor, static_cast<unsigned>(PropertyAttribute::DontEnum)); \
});
FOR_EACH_TYPED_ARRAY_TYPE_EXCLUDING_DATA_VIEW(INIT_TYPED_ARRAY_LATER)
@@ -837,7 +837,7 @@
JSObject* regExpSymbolReplace = asObject(m_regExpPrototype->getDirect(vm, vm.propertyNames->replaceSymbol).asCell());
m_regExpProtoSymbolReplace.set(vm, this, regExpSymbolReplace);
-#define CREATE_PRIVATE_GLOBAL_FUNCTION(name, code) JSFunction* name ## PrivateFunction = JSFunction::create(vm, code ## CodeGenerator(vm).value(), this);
+#define CREATE_PRIVATE_GLOBAL_FUNCTION(name, code) JSFunction* name ## PrivateFunction = JSFunction::create(vm, code ## CodeGenerator(vm), this);
JSC_FOREACH_BUILTIN_FUNCTION_PRIVATE_GLOBAL_NAME(CREATE_PRIVATE_GLOBAL_FUNCTION)
#undef CREATE_PRIVATE_GLOBAL_FUNCTION
Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/JSObject.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -2034,15 +2034,12 @@
return !result.isString();
}
-bool JSObject::getOwnStaticPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
+bool JSObject::getOwnStaticPropertySlot(VM& vm, PropertyName propertyName, PropertySlot& slot)
{
- VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
for (auto* info = classInfo(vm); info; info = info->parentClass) {
if (auto* table = info->staticPropHashTable) {
- if (getStaticPropertySlotFromTable(exec, table->classForThis, *table, this, propertyName, slot))
+ if (getStaticPropertySlotFromTable(vm, table->classForThis, *table, this, propertyName, slot))
return true;
- RETURN_IF_EXCEPTION(scope, false);
}
}
return false;
@@ -2328,7 +2325,6 @@
{
ASSERT(!staticPropertiesReified());
VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
// If this object's ClassInfo has no static properties, then nothing to reify!
// We can safely set the flag to avoid the expensive check again in the future.
@@ -2349,10 +2345,8 @@
unsigned attributes;
auto key = Identifier::fromString(&vm, value.m_key);
PropertyOffset offset = getDirectOffset(vm, key, attributes);
- if (!isValidOffset(offset)) {
- reifyStaticProperty(vm, exec, hashTable->classForThis, key, value, *this);
- RETURN_IF_EXCEPTION(scope, void());
- }
+ if (!isValidOffset(offset))
+ reifyStaticProperty(vm, hashTable->classForThis, key, value, *this);
}
}
Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/JSObject.h 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h 2018-03-30 16:05:22 UTC (rev 230105)
@@ -94,7 +94,7 @@
friend class JSCell;
friend class JSFinalObject;
friend class MarkedBlock;
- JS_EXPORT_PRIVATE friend bool setUpStaticFunctionSlot(ExecState*, const HashTableValue*, JSObject*, PropertyName, PropertySlot&);
+ JS_EXPORT_PRIVATE friend bool setUpStaticFunctionSlot(VM&, const HashTableValue*, JSObject*, PropertyName, PropertySlot&);
enum PutMode {
PutModePut,
@@ -1027,11 +1027,11 @@
JS_EXPORT_PRIVATE NEVER_INLINE bool putInlineSlow(ExecState*, PropertyName, JSValue, PutPropertySlot&);
bool getNonIndexPropertySlot(ExecState*, PropertyName, PropertySlot&);
- bool getOwnNonIndexPropertySlot(ExecState*, Structure*, PropertyName, PropertySlot&);
+ bool getOwnNonIndexPropertySlot(VM&, Structure*, PropertyName, PropertySlot&);
JS_EXPORT_PRIVATE void fillGetterPropertySlot(PropertySlot&, JSCell*, unsigned, PropertyOffset);
void fillCustomGetterPropertySlot(VM&, PropertySlot&, CustomGetterSetter*, unsigned, Structure*);
- JS_EXPORT_PRIVATE bool getOwnStaticPropertySlot(ExecState*, PropertyName, PropertySlot&);
+ JS_EXPORT_PRIVATE bool getOwnStaticPropertySlot(VM&, PropertyName, PropertySlot&);
struct PropertyHashEntry {
const HashTable* table;
const HashTableValue* value;
@@ -1343,15 +1343,14 @@
// It is safe to call this method with a PropertyName that is actually an index,
// but if so will always return false (doesn't search index storage).
-ALWAYS_INLINE bool JSObject::getOwnNonIndexPropertySlot(ExecState* exec, Structure* structure, PropertyName propertyName, PropertySlot& slot)
+ALWAYS_INLINE bool JSObject::getOwnNonIndexPropertySlot(VM& vm, Structure* structure, PropertyName propertyName, PropertySlot& slot)
{
- VM& vm = exec->vm();
unsigned attributes;
PropertyOffset offset = structure->get(vm, propertyName, attributes);
if (!isValidOffset(offset)) {
if (!TypeInfo::hasStaticPropertyTable(inlineTypeFlags()))
return false;
- return getOwnStaticPropertySlot(exec, propertyName, slot);
+ return getOwnStaticPropertySlot(vm, propertyName, slot);
}
// getPropertySlot relies on this method never returning index properties!
@@ -1401,11 +1400,9 @@
ALWAYS_INLINE bool JSObject::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
{
VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
Structure* structure = object->structure(vm);
- if (object->getOwnNonIndexPropertySlot(exec, structure, propertyName, slot))
+ if (object->getOwnNonIndexPropertySlot(vm, structure, propertyName, slot))
return true;
- RETURN_IF_EXCEPTION(scope, false);
if (std::optional<uint32_t> index = parseIndex(propertyName))
return getOwnPropertySlotByIndex(object, exec, index.value(), slot);
return false;
@@ -1412,11 +1409,10 @@
}
// It may seem crazy to inline a function this large but it makes a big difference
-// since this function is very hot in variable lookup
+// since this is function very hot in variable lookup
ALWAYS_INLINE bool JSObject::getPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
{
VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
auto& structureIDTable = vm.heap.structureIDTable();
JSObject* object = this;
while (true) {
@@ -1433,9 +1429,8 @@
}
ASSERT(object->type() != ProxyObjectType);
Structure* structure = structureIDTable.get(object->structureID());
- if (object->getOwnNonIndexPropertySlot(exec, structure, propertyName, slot))
+ if (object->getOwnNonIndexPropertySlot(vm, structure, propertyName, slot))
return true;
- RETURN_IF_EXCEPTION(scope, false);
// FIXME: This doesn't look like it's following the specification:
// https://bugs.webkit.org/show_bug.cgi?id=172572
JSValue prototype = structure->storedPrototype(object);
@@ -1636,7 +1631,7 @@
#define JSC_BUILTIN_FUNCTION_WITHOUT_TRANSITION(jsName, generatorName, attributes) \
putDirectBuiltinFunctionWithoutTransition(\
- vm, globalObject, makeIdentifier(vm, (jsName)), (generatorName)(vm).value(), (attributes))
+ vm, globalObject, makeIdentifier(vm, (jsName)), (generatorName)(vm), (attributes))
// Helper for defining native getters on properties.
#define JSC_NATIVE_INTRINSIC_GETTER(jsName, cppName, attributes, intrinsic) \
Modified: trunk/Source/_javascript_Core/runtime/JSObjectInlines.h (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/JSObjectInlines.h 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/JSObjectInlines.h 2018-03-30 16:05:22 UTC (rev 230105)
@@ -140,9 +140,8 @@
while (true) {
Structure* structure = structureIDTable.get(object->structureID());
if (LIKELY(!TypeInfo::overridesGetOwnPropertySlot(object->inlineTypeFlags()))) {
- if (object->getOwnNonIndexPropertySlot(exec, structure, propertyName, slot))
+ if (object->getOwnNonIndexPropertySlot(vm, structure, propertyName, slot))
return true;
- RETURN_IF_EXCEPTION(scope, false);
} else {
bool hasSlot = structure->classInfo()->methodTable.getOwnPropertySlot(object, exec, propertyName, slot);
RETURN_IF_EXCEPTION(scope, false);
Modified: trunk/Source/_javascript_Core/runtime/JSTypedArrayViewPrototype.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/JSTypedArrayViewPrototype.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/JSTypedArrayViewPrototype.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -330,7 +330,7 @@
toStringTagAccessor->setGetter(vm, globalObject, toStringTagFunction);
putDirectNonIndexAccessor(vm, vm.propertyNames->toStringTagSymbol, toStringTagAccessor, PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly | PropertyAttribute::Accessor);
- JSFunction* valuesFunction = JSFunction::create(vm, typedArrayPrototypeValuesCodeGenerator(vm).value(), globalObject);
+ JSFunction* valuesFunction = JSFunction::create(vm, typedArrayPrototypeValuesCodeGenerator(vm), globalObject);
putDirectWithoutTransition(vm, vm.propertyNames->builtinNames().valuesPublicName(), valuesFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->iteratorSymbol, valuesFunction, static_cast<unsigned>(PropertyAttribute::DontEnum));
Modified: trunk/Source/_javascript_Core/runtime/Lookup.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/Lookup.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/Lookup.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -33,7 +33,7 @@
if (value.accessorGetter()) {
JSFunction* function = nullptr;
if (value.attributes() & PropertyAttribute::Builtin)
- function = JSFunction::create(vm, value.builtinAccessorGetterGenerator()(vm).value(), globalObject);
+ function = JSFunction::create(vm, value.builtinAccessorGetterGenerator()(vm), globalObject);
else {
String getterName = tryMakeString(ASCIILiteral("get "), String(*propertyName.publicName()));
if (!getterName)
@@ -45,10 +45,8 @@
thisObject.putDirectNonIndexAccessor(vm, propertyName, accessor, attributesForStructure(value.attributes()));
}
-bool setUpStaticFunctionSlot(ExecState* exec, const ClassInfo* classInfo, const HashTableValue* entry, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
+bool setUpStaticFunctionSlot(VM& vm, const ClassInfo* classInfo, const HashTableValue* entry, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
{
- VM& vm = exec->vm();
- auto scope = DECLARE_THROW_SCOPE(vm);
ASSERT(thisObject->globalObject());
ASSERT(entry->attributes() & PropertyAttribute::BuiltinOrFunctionOrAccessorOrLazyProperty);
unsigned attributes;
@@ -61,8 +59,7 @@
if (thisObject->staticPropertiesReified())
return false;
- reifyStaticProperty(vm, exec, classInfo, propertyName, *entry, *thisObject);
- RETURN_IF_EXCEPTION(scope, false);
+ reifyStaticProperty(vm, classInfo, propertyName, *entry, *thisObject);
offset = thisObject->getDirectOffset(vm, propertyName, attributes);
if (!isValidOffset(offset)) {
Modified: trunk/Source/_javascript_Core/runtime/Lookup.h (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/Lookup.h 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/Lookup.h 2018-03-30 16:05:22 UTC (rev 230105)
@@ -31,12 +31,10 @@
#include "JSFunction.h"
#include "JSGlobalObject.h"
#include "LazyProperty.h"
-#include "ParserError.h"
#include "PropertySlot.h"
#include "PutPropertySlot.h"
#include "TypeError.h"
#include <wtf/Assertions.h>
-#include <wtf/Expected.h>
namespace JSC {
@@ -49,7 +47,7 @@
// ie. typedef JSValue (*GetFunction)(ExecState*, JSObject* baseObject)
typedef PropertySlot::GetValueFunc GetFunction;
typedef PutPropertySlot::PutValueFunc PutFunction;
-typedef Expected<FunctionExecutable*, ParserError> (*BuiltinGenerator)(VM&);
+typedef FunctionExecutable* (*BuiltinGenerator)(VM&);
typedef JSValue (*LazyPropertyCallback)(VM&, JSObject*);
// Hash table generated by the create_hash_table script.
@@ -205,7 +203,7 @@
}
};
-JS_EXPORT_PRIVATE bool setUpStaticFunctionSlot(ExecState*, const ClassInfo*, const HashTableValue*, JSObject* thisObject, PropertyName, PropertySlot&);
+JS_EXPORT_PRIVATE bool setUpStaticFunctionSlot(VM&, const ClassInfo*, const HashTableValue*, JSObject* thisObject, PropertyName, PropertySlot&);
JS_EXPORT_PRIVATE void reifyStaticAccessor(VM&, const HashTableValue&, JSObject& thisObject, PropertyName);
inline BuiltinGenerator HashTableValue::builtinAccessorGetterGenerator() const
@@ -222,7 +220,7 @@
return reinterpret_cast<BuiltinGenerator>(m_values.value2);
}
-inline bool getStaticPropertySlotFromTable(ExecState* exec, const ClassInfo* classInfo, const HashTable& table, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
+inline bool getStaticPropertySlotFromTable(VM& vm, const ClassInfo* classInfo, const HashTable& table, JSObject* thisObject, PropertyName propertyName, PropertySlot& slot)
{
if (thisObject->staticPropertiesReified())
return false;
@@ -232,7 +230,7 @@
return false;
if (entry->attributes() & PropertyAttribute::BuiltinOrFunctionOrAccessorOrLazyProperty)
- return setUpStaticFunctionSlot(exec, classInfo, entry, thisObject, propertyName, slot);
+ return setUpStaticFunctionSlot(vm, classInfo, entry, thisObject, propertyName, slot);
if (entry->attributes() & PropertyAttribute::ConstantInteger) {
slot.setValue(thisObject, attributesForStructure(entry->attributes()), jsNumber(entry->constantInteger()));
@@ -321,24 +319,13 @@
return true;
}
-inline void reifyStaticProperty(VM& vm, ExecState* execIfAvailable, const ClassInfo* classInfo, const PropertyName& propertyName, const HashTableValue& value, JSObject& thisObj)
+inline void reifyStaticProperty(VM& vm, const ClassInfo* classInfo, const PropertyName& propertyName, const HashTableValue& value, JSObject& thisObj)
{
- ASSERT(execIfAvailable == nullptr || &vm == &(execIfAvailable->vm()));
-
if (value.attributes() & PropertyAttribute::Builtin) {
if (value.attributes() & PropertyAttribute::Accessor)
reifyStaticAccessor(vm, value, thisObj, propertyName);
- else {
- Expected<FunctionExecutable*, ParserError> f = value.builtinGenerator()(vm);
- if (f.has_value())
- thisObj.putDirectBuiltinFunction(vm, thisObj.globalObject(), propertyName, f.value(), attributesForStructure(value.attributes()));
- else if (execIfAvailable)
- f.error().throwStackOverflowOrOutOfMemory(execIfAvailable);
- else {
- dataLogLn("Fatal parser error (probably a stack overflow), and no ExecState available for throwing a JS exception");
- CRASH();
- }
- }
+ else
+ thisObj.putDirectBuiltinFunction(vm, thisObj.globalObject(), propertyName, value.builtinGenerator()(vm), attributesForStructure(value.attributes()));
return;
}
@@ -413,7 +400,7 @@
if (!value.m_key)
continue;
auto key = Identifier::fromString(&vm, reinterpret_cast<const LChar*>(value.m_key), strlen(value.m_key));
- reifyStaticProperty(vm, nullptr, classInfo, key, value, thisObj);
+ reifyStaticProperty(vm, classInfo, key, value, thisObj);
}
}
Modified: trunk/Source/_javascript_Core/runtime/MapPrototype.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/MapPrototype.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/MapPrototype.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -71,7 +71,7 @@
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->builtinNames().getPrivateName(), mapProtoFuncGet, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, JSMapGetIntrinsic);
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->builtinNames().setPrivateName(), mapProtoFuncSet, static_cast<unsigned>(PropertyAttribute::DontEnum), 2, JSMapSetIntrinsic);
- JSFunction* entries = JSFunction::create(vm, mapPrototypeEntriesCodeGenerator(vm).value(), globalObject);
+ JSFunction* entries = JSFunction::create(vm, mapPrototypeEntriesCodeGenerator(vm), globalObject);
putDirectWithoutTransition(vm, vm.propertyNames->builtinNames().entriesPublicName(), entries, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->iteratorSymbol, entries, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->toStringTagSymbol, jsString(&vm, "Map"), PropertyAttribute::DontEnum | PropertyAttribute::ReadOnly);
Modified: trunk/Source/_javascript_Core/runtime/SetPrototype.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/runtime/SetPrototype.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/runtime/SetPrototype.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -68,7 +68,7 @@
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->builtinNames().hasPrivateName(), setProtoFuncHas, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, JSSetHasIntrinsic);
JSC_NATIVE_INTRINSIC_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->builtinNames().addPrivateName(), setProtoFuncAdd, static_cast<unsigned>(PropertyAttribute::DontEnum), 1, JSSetAddIntrinsic);
- JSFunction* values = JSFunction::create(vm, setPrototypeValuesCodeGenerator(vm).value(), globalObject);
+ JSFunction* values = JSFunction::create(vm, setPrototypeValuesCodeGenerator(vm), globalObject);
putDirectWithoutTransition(vm, vm.propertyNames->builtinNames().valuesPublicName(), values, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->builtinNames().keysPublicName(), values, static_cast<unsigned>(PropertyAttribute::DontEnum));
putDirectWithoutTransition(vm, vm.propertyNames->iteratorSymbol, values, static_cast<unsigned>(PropertyAttribute::DontEnum));
Modified: trunk/Source/_javascript_Core/tools/JSDollarVM.cpp (230104 => 230105)
--- trunk/Source/_javascript_Core/tools/JSDollarVM.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/_javascript_Core/tools/JSDollarVM.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -26,7 +26,7 @@
#include "config.h"
#include "JSDollarVM.h"
-#include "BuiltinExecutables.h"
+#include "BuiltinExecutableCreator.h"
#include "CodeBlock.h"
#include "DOMAttributeGetterSetter.h"
#include "DOMJITGetterSetter.h"
@@ -1522,8 +1522,9 @@
RETURN_IF_EXCEPTION(scope, encodedJSValue());
const SourceCode& source = makeSource(functionText, { });
- auto unlinked = BuiltinExecutables::createExecutableOrCrash(vm, source, Identifier::fromString(&vm, "foo"), ConstructorKind::None, ConstructAbility::CannotConstruct);
- return JSValue::encode(JSFunction::create(vm, unlinked->link(vm, source), exec->lexicalGlobalObject()));
+ JSFunction* func = JSFunction::create(vm, createBuiltinExecutable(vm, source, Identifier::fromString(&vm, "foo"), ConstructorKind::None, ConstructAbility::CannotConstruct)->link(vm, source), exec->lexicalGlobalObject());
+
+ return JSValue::encode(func);
}
static EncodedJSValue JSC_HOST_CALL functionCreateRoot(ExecState* exec)
Modified: trunk/Source/WebCore/ChangeLog (230104 => 230105)
--- trunk/Source/WebCore/ChangeLog 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/WebCore/ChangeLog 2018-03-30 16:05:22 UTC (rev 230105)
@@ -1,3 +1,17 @@
+2018-03-30 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r230102.
+
+ Caused assertion failures on JSC bots.
+
+ Reverted changeset:
+
+ "A stack overflow in the parsing of a builtin (called by
+ createExecutable) cause a crash instead of a catchable js
+ exception"
+ https://bugs.webkit.org/show_bug.cgi?id=184074
+ https://trac.webkit.org/changeset/230102
+
2018-03-30 Robin Morisset <[email protected]>
A stack overflow in the parsing of a builtin (called by createExecutable) cause a crash instead of a catchable js exception
Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp (230104 => 230105)
--- trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -124,27 +124,27 @@
template<> FunctionExecutable* JSBuiltinReadableStreamDefaultReaderPrivateConstructor::initializeExecutable(JSC::VM& vm)
{
- return readableStreamInternalsPrivateInitializeReadableStreamDefaultReaderCodeGenerator(vm).value();
+ return readableStreamInternalsPrivateInitializeReadableStreamDefaultReaderCodeGenerator(vm);
}
template<> FunctionExecutable* JSBuiltinReadableStreamDefaultControllerPrivateConstructor::initializeExecutable(JSC::VM& vm)
{
- return readableStreamInternalsPrivateInitializeReadableStreamDefaultControllerCodeGenerator(vm).value();
+ return readableStreamInternalsPrivateInitializeReadableStreamDefaultControllerCodeGenerator(vm);
}
template<> FunctionExecutable* JSBuiltinReadableByteStreamControllerPrivateConstructor::initializeExecutable(JSC::VM& vm)
{
- return readableByteStreamInternalsPrivateInitializeReadableByteStreamControllerCodeGenerator(vm).value();
+ return readableByteStreamInternalsPrivateInitializeReadableByteStreamControllerCodeGenerator(vm);
}
template<> FunctionExecutable* JSBuiltinReadableStreamBYOBReaderPrivateConstructor::initializeExecutable(JSC::VM& vm)
{
- return readableByteStreamInternalsPrivateInitializeReadableStreamBYOBReaderCodeGenerator(vm).value();
+ return readableByteStreamInternalsPrivateInitializeReadableStreamBYOBReaderCodeGenerator(vm);
}
template<> FunctionExecutable* JSBuiltinReadableStreamBYOBRequestPrivateConstructor::initializeExecutable(JSC::VM& vm)
{
- return readableByteStreamInternalsPrivateInitializeReadableStreamBYOBRequestCodeGenerator(vm).value();
+ return readableByteStreamInternalsPrivateInitializeReadableStreamBYOBRequestCodeGenerator(vm);
}
JSObject* createReadableStreamDefaultReaderPrivateConstructor(VM& vm, JSDOMGlobalObject& globalObject)
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (230104 => 230105)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2018-03-30 16:05:22 UTC (rev 230105)
@@ -7173,7 +7173,7 @@
if (IsJSBuiltinConstructor($interface)) {
push(@$outputArray, "template<> FunctionExecutable* ${constructorClassName}::initializeExecutable(VM& vm)\n");
push(@$outputArray, "{\n");
- push(@$outputArray, " return " . GetJSBuiltinFunctionNameFromString($interface->type->name, "initialize" . $interface->type->name) . "(vm).value();\n");
+ push(@$outputArray, " return " . GetJSBuiltinFunctionNameFromString($interface->type->name, "initialize" . $interface->type->name) . "(vm);\n");
push(@$outputArray, "}\n");
push(@$outputArray, "\n");
}
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp (230104 => 230105)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestClassWithJSBuiltinConstructor.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -82,7 +82,7 @@
template<> FunctionExecutable* JSTestClassWithJSBuiltinConstructorConstructor::initializeExecutable(VM& vm)
{
- return testClassWithJSBuiltinConstructorInitializeTestClassWithJSBuiltinConstructorCodeGenerator(vm).value();
+ return testClassWithJSBuiltinConstructorInitializeTestClassWithJSBuiltinConstructorCodeGenerator(vm);
}
template<> const ClassInfo JSTestClassWithJSBuiltinConstructorConstructor::s_info = { "TestClassWithJSBuiltinConstructor", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSTestClassWithJSBuiltinConstructorConstructor) };
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp (230104 => 230105)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp 2018-03-30 16:00:10 UTC (rev 230104)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp 2018-03-30 16:05:22 UTC (rev 230105)
@@ -91,7 +91,7 @@
template<> FunctionExecutable* JSTestJSBuiltinConstructorConstructor::initializeExecutable(VM& vm)
{
- return testJSBuiltinConstructorInitializeTestJSBuiltinConstructorCodeGenerator(vm).value();
+ return testJSBuiltinConstructorInitializeTestJSBuiltinConstructorCodeGenerator(vm);
}
template<> const ClassInfo JSTestJSBuiltinConstructorConstructor::s_info = { "TestJSBuiltinConstructor", &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSTestJSBuiltinConstructorConstructor) };
