Changeset 294082 in webkit for trunk/Source/JavaScriptCore/parser/Parser.h

Timestamp:

May 11, 2022, 5:31:54 PM (3 years ago)

Author:

Patrick Angle

Message:

Web Inspector: Parse InjectedScriptSource as a built-in to get guaranteed non-user-overriden JSC built-ins
​https://bugs.webkit.org/show_bug.cgi?id=152294

Reviewed by Devin Rousso.

Source/JavaScriptCore:

Covered by existing tests, and new test cases in LayoutTests/inspector/injected-script/observable.html

• CMakeLists.txt:
• DerivedSources-output.xcfilelist:
• DerivedSources.make:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Build InjectedScriptSource.js as a builtin, not as a plain header file containing its source code.

• Scripts/wkbuiltins/builtins_model.py:

(BuiltinFunction.fromString):
(BuiltinsCollection._parse_functions):

• InspectorInjectedScript contains unbalanced curly brackets inside quotes. The generation of builtins is now

hardened against this. Previously all curly brackets were counted, which meant that the source code would be cut
off earlier than the actual end of the function.

• builtins/BuiltinExecutables.cpp:

(JSC::BuiltinExecutables::createExecutable):

• CommandLineAPIModuleSource.js uses destructuring to get the RemoteObject and CommandLineAPI classes at

instantiation. We need to treat this destructure as a single parameter, otherwise debug assertions will catch
the discrepancy between parameter counts.

• builtins/BuiltinNames.h:
• bytecode/LinkTimeConstant.h:
• Add symbols that we need to have a private version of, and for some of those symbols make them link-time constants.

• builtins/IteratorHelpers.js:

(globalPrivate.builtinSetIterable):
(globalPrivate.builtinMapIterable):

• Add reusable helpers for getting builtin iterators for Maps and Sets. This is done with private symbols that

represent the same function that the iterator would have returned. We create a new wrapper object to allow usage
to follow the same pattern at dealing with an unwrapped iterable object.

• inspector/InjectedScriptManager.cpp:

(Inspector::InjectedScriptManager::createInjectedScript):
(Inspector::InjectedScriptManager::injectedScriptFor):
(Inspector::InjectedScriptManager::injectedScriptSource): Deleted.

• inspector/InjectedScriptManager.h:
• Use the new link-time constant for the Injected Script creation function.

• inspector/InjectedScriptModule.cpp:

(Inspector::InjectedScriptModule::ensureInjected):

• inspector/InjectedScriptModule.h:
• Injected modules are now provided as a JSFunction, not raw source code.

• inspector/InjectedScriptSource.js:
• Use private symbols throughout to ensure we get non-observable, non-overridden versions of functions and values.
• In many cases, this is a 1:1 mapping where the new symbol is just prefixed with an @.
• For pushing values to arrays, use @arrayPush, the builtin way of pushing a value into an array.
• For the Symbol constructor, just use the existing @createPrivateSymbol instead of exposing a private

version of the Symbol constructor..

• Symbol.toStringTag is converted to @@toStringTag, the private version of that symbol.
• Math.max in RemoteObject.._generatePreview now uses a helper function that performs a comparison

instead of exposing both Math and Math.max as private builtins.

• Create objects as -less using the new builtin helper @createlessObject, which can also take

arguments that are key value pairs for near-parity with normal Object creation via {}.

• Create arrays as -less using the new builtin helper @createlessArray, which can also take

arguments which are entries to put into the array.

• For spreading arguments (for the console commandline functions) we should create a new less array to

spread instead of spreading the raw arguments to avoid interacting with a potentially modified iterator.

• parser/Parser.h:

(JSC::parse):

• Add the line number to builtin compilation logging to help identify where sometimes ambiguous errors occurred.

• runtime/ArrayConstructor.cpp:
• runtime/Array.cpp:
• runtime/Map.cpp:
• runtime/ObjectConstructor.cpp:
• runtime/Set.cpp:
• runtime/String.cpp:
• Expose necessary functions/constructors via their private name for use in InjectedScriptSource.js and

CommandLineAPIModuleSource.js

• runtime/JSGlobalObject.cpp:

(JSC::JSC_DEFINE_HOST_FUNCTION):
(JSC::JSGlobalObject::init):

• runtime/JSGlobalObject.h:
• Add a link-time constant for the String constructor.
• Add helpers for JSON parsing/serialization.

Source/WebCore:

• CMakeLists.txt:
• DerivedSources-output.xcfilelist:
• DerivedSources.make:
• Headers.cmake:
• WebCore.xcodeproj/project.pbxproj:
• Build CommandLineAPIModuleSource.js as a builtin, not as a plain header file containing its source code.

• inspector/CommandLineAPIModule.cpp:

(WebCore::CommandLineAPIModule::injectModuleFunction const):
(WebCore::CommandLineAPIModule::source const): Deleted.

• inspector/CommandLineAPIModule.h:
• Provide a JSFunction for module injection instead of raw source code.

• inspector/CommandLineAPIModuleSource.js:
• Similar to JavaScriptCore/inspector/InjectedScriptSource.js, use private names for properties and functions

throughout to get non-user-overridden builtins.

• In normalizeEventTypes use a Set instead of an array, since we are processing user-provided types that may

be repeated. This means that we need to iterate over all the types to insert them in the set, but since
@arrayPush doesn't support pushing multiple values at the same time this is no more work than using an Array.

LayoutTests:

• inspector/injected-script/observable-expected.txt:
• inspector/injected-script/observable.html:
• Add several more test cases for overriding functions and entire objects.

• inspector/debugger/pause-for-internal-scripts-expected.txt:
• inspector/debugger/pause-for-internal-scripts.html:
• Changed to test a custom internal script snippet since the inspector injected script is now a builtin.

• inspector/debugger/scriptParsed-expected.txt:
• inspector/debugger/scriptParsed.html:
• The inspector injected script (and modules) will no longer appear as scripts in Web Inspector.

• inspector/model/remote-object/error-expected.txt:
• inspector/timeline/line-column.html:
• inspector/timeline/line-column-expected.txt:
• platform/gtk/inspector/timeline/line-column-expected.txt:
• Inspector injected script line numbers are different between release and debug builds, so filter those out.

File:

• trunk/Source/JavaScriptCore/parser/Parser.h (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -2222 +2222 @@
                 ASSERT(error.isValid());
                 if (error.type() != ParserError::StackOverflow)
-                    dataLogLn("Unexpected error compiling builtin: ", error.message());
+                    dataLogLn("Unexpected error compiling builtin: ", error.message(), " on line ", error.line(), ".");
             }
         }