Attachment 332988 Details for Bug 182445 – Patch

[patch] Patch

bug-182445.diff (text/plain), 12.19 KB, created by Don Olmstead on 2018-02-02 11:58:09 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Don Olmstead

Created: 2018-02-02 11:58:09 PST

Size: 12.19 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 373c82068e2..909d72729ca 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-02-02  Don Olmstead  <don.olmstead@sony.com>
>+
>+        JS Builtins should include JavaScriptCore headers directly
>+        https://bugs.webkit.org/show_bug.cgi?id=182445
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/builtins/builtins_generator.py:
>+        (BuiltinsGenerator.model): Deleted.
>+        (BuiltinsGenerator.generate_output): Deleted.
>+        (BuiltinsGenerator.output_filename): Deleted.
>+        (BuiltinsGenerator.generate_license): Deleted.
>+        (BuiltinsGenerator.generate_includes_from_entries): Deleted.
>+        (BuiltinsGenerator.generate_primary_header_includes): Deleted.
>+        (BuiltinsGenerator.generate_embedded_code_string_section_for_function): Deleted.
>+        (BuiltinsGenerator.wrap_with_guard): Deleted.
>+        (BuiltinsGenerator.mangledNameForObject): Deleted.
>+        (BuiltinsGenerator.mangledNameForObject.toCamel): Deleted.
>+        (BuiltinsGenerator.mangledNameForFunction): Deleted.
>+        (BuiltinsGenerator.mangledNameForFunction.toCamel): Deleted.
>+        * Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result:
>+        * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
>+        * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
>+        * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
>+        * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
>+        * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
>+
> 2018-02-01  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         -Wreturn-type warning in DFGObjectAllocationSinkingPhase.cpp
>diff --git a/Source/JavaScriptCore/Scripts/builtins/builtins_generator.py b/Source/JavaScriptCore/Scripts/builtins/builtins_generator.py
>index 4950113ca66..1f2e80ea361 100644
>--- a/Source/JavaScriptCore/Scripts/builtins/builtins_generator.py
>+++ b/Source/JavaScriptCore/Scripts/builtins/builtins_generator.py
>@@ -98,7 +98,7 @@ class BuiltinsGenerator:
>             if self.model().framework.name not in allowed_framework_names:
>                 continue
>             if self.model().framework.name != framework_name:
>-                includes.add("#include <%s>" % header_path)
>+                includes.add("#include <%s/%s>" % (framework_name, os.path.basename(header_path)))
>             else:
>                 includes.add("#include \"%s\"" % os.path.basename(header_path))
> 
>diff --git a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result
>index 64733af7880..b8bcfb847e0 100644
>--- a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result
>+++ b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-AnotherGuardedInternalBuiltin-Separate.js-result
>@@ -32,10 +32,10 @@
> 
> #if ENABLE(FETCH_API)
> 
>-#include <builtins/BuiltinUtils.h>
>-#include <bytecode/UnlinkedFunctionExecutable.h>
>-#include <runtime/Identifier.h>
>-#include <runtime/JSFunction.h>
>+#include <JavaScriptCore/BuiltinUtils.h>
>+#include <JavaScriptCore/Identifier.h>
>+#include <JavaScriptCore/JSFunction.h>
>+#include <JavaScriptCore/UnlinkedFunctionExecutable.h>
> 
> namespace JSC {
> class FunctionExecutable;
>@@ -193,13 +193,13 @@ inline void AnotherGuardedInternalBuiltinBuiltinFunctions::visit(JSC::SlotVisito
> #if ENABLE(FETCH_API)
> 
> #include "WebCoreJSClientData.h"
>-#include <heap/HeapInlines.h>
>-#include <runtime/IdentifierInlines.h>
>-#include <runtime/Intrinsic.h>
>-#include <runtime/JSCJSValueInlines.h>
>-#include <runtime/JSCellInlines.h>
>-#include <runtime/StructureInlines.h>
>-#include <runtime/VM.h>
>+#include <JavaScriptCore/HeapInlines.h>
>+#include <JavaScriptCore/IdentifierInlines.h>
>+#include <JavaScriptCore/Intrinsic.h>
>+#include <JavaScriptCore/JSCJSValueInlines.h>
>+#include <JavaScriptCore/JSCellInlines.h>
>+#include <JavaScriptCore/StructureInlines.h>
>+#include <JavaScriptCore/VM.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result
>index 4a4a3dcf420..d4d41bf0c3d 100644
>--- a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result
>+++ b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result
>@@ -33,10 +33,10 @@
> 
> #if ENABLE(STREAMS_API) || USE(CF)
> 
>-#include <builtins/BuiltinUtils.h>
>-#include <bytecode/UnlinkedFunctionExecutable.h>
>-#include <runtime/Identifier.h>
>-#include <runtime/JSFunction.h>
>+#include <JavaScriptCore/BuiltinUtils.h>
>+#include <JavaScriptCore/Identifier.h>
>+#include <JavaScriptCore/JSFunction.h>
>+#include <JavaScriptCore/UnlinkedFunctionExecutable.h>
> 
> namespace JSC {
> class FunctionExecutable;
>@@ -163,13 +163,13 @@ inline void ArbitraryConditionalGuardBuiltinsWrapper::exportNames()
> #if ENABLE(STREAMS_API) || USE(CF)
> 
> #include "WebCoreJSClientData.h"
>-#include <heap/HeapInlines.h>
>-#include <runtime/IdentifierInlines.h>
>-#include <runtime/Intrinsic.h>
>-#include <runtime/JSCJSValueInlines.h>
>-#include <runtime/JSCellInlines.h>
>-#include <runtime/StructureInlines.h>
>-#include <runtime/VM.h>
>+#include <JavaScriptCore/HeapInlines.h>
>+#include <JavaScriptCore/IdentifierInlines.h>
>+#include <JavaScriptCore/Intrinsic.h>
>+#include <JavaScriptCore/JSCJSValueInlines.h>
>+#include <JavaScriptCore/JSCellInlines.h>
>+#include <JavaScriptCore/StructureInlines.h>
>+#include <JavaScriptCore/VM.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result
>index fea50c3521f..59254ce2ce0 100644
>--- a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result
>+++ b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result
>@@ -33,10 +33,10 @@
> 
> #if ENABLE(STREAMS_API)
> 
>-#include <builtins/BuiltinUtils.h>
>-#include <bytecode/UnlinkedFunctionExecutable.h>
>-#include <runtime/Identifier.h>
>-#include <runtime/JSFunction.h>
>+#include <JavaScriptCore/BuiltinUtils.h>
>+#include <JavaScriptCore/Identifier.h>
>+#include <JavaScriptCore/JSFunction.h>
>+#include <JavaScriptCore/UnlinkedFunctionExecutable.h>
> 
> namespace JSC {
> class FunctionExecutable;
>@@ -163,13 +163,13 @@ inline void GuardedBuiltinBuiltinsWrapper::exportNames()
> #if ENABLE(STREAMS_API)
> 
> #include "WebCoreJSClientData.h"
>-#include <heap/HeapInlines.h>
>-#include <runtime/IdentifierInlines.h>
>-#include <runtime/Intrinsic.h>
>-#include <runtime/JSCJSValueInlines.h>
>-#include <runtime/JSCellInlines.h>
>-#include <runtime/StructureInlines.h>
>-#include <runtime/VM.h>
>+#include <JavaScriptCore/HeapInlines.h>
>+#include <JavaScriptCore/IdentifierInlines.h>
>+#include <JavaScriptCore/Intrinsic.h>
>+#include <JavaScriptCore/JSCJSValueInlines.h>
>+#include <JavaScriptCore/JSCellInlines.h>
>+#include <JavaScriptCore/StructureInlines.h>
>+#include <JavaScriptCore/VM.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result
>index e9d1d48e997..65dd3e84310 100644
>--- a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result
>+++ b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result
>@@ -33,10 +33,10 @@
> 
> #if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
> 
>-#include <builtins/BuiltinUtils.h>
>-#include <bytecode/UnlinkedFunctionExecutable.h>
>-#include <runtime/Identifier.h>
>-#include <runtime/JSFunction.h>
>+#include <JavaScriptCore/BuiltinUtils.h>
>+#include <JavaScriptCore/Identifier.h>
>+#include <JavaScriptCore/JSFunction.h>
>+#include <JavaScriptCore/UnlinkedFunctionExecutable.h>
> 
> namespace JSC {
> class FunctionExecutable;
>@@ -195,13 +195,13 @@ inline void GuardedInternalBuiltinBuiltinFunctions::visit(JSC::SlotVisitor& visi
> #if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
> 
> #include "WebCoreJSClientData.h"
>-#include <heap/HeapInlines.h>
>-#include <runtime/IdentifierInlines.h>
>-#include <runtime/Intrinsic.h>
>-#include <runtime/JSCJSValueInlines.h>
>-#include <runtime/JSCellInlines.h>
>-#include <runtime/StructureInlines.h>
>-#include <runtime/VM.h>
>+#include <JavaScriptCore/HeapInlines.h>
>+#include <JavaScriptCore/IdentifierInlines.h>
>+#include <JavaScriptCore/Intrinsic.h>
>+#include <JavaScriptCore/JSCJSValueInlines.h>
>+#include <JavaScriptCore/JSCellInlines.h>
>+#include <JavaScriptCore/StructureInlines.h>
>+#include <JavaScriptCore/VM.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result
>index 6c74d0d3d4c..06c935ac814 100644
>--- a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result
>+++ b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result
>@@ -31,10 +31,10 @@
> 
> #pragma once
> 
>-#include <builtins/BuiltinUtils.h>
>-#include <bytecode/UnlinkedFunctionExecutable.h>
>-#include <runtime/Identifier.h>
>-#include <runtime/JSFunction.h>
>+#include <JavaScriptCore/BuiltinUtils.h>
>+#include <JavaScriptCore/Identifier.h>
>+#include <JavaScriptCore/JSFunction.h>
>+#include <JavaScriptCore/UnlinkedFunctionExecutable.h>
> 
> namespace JSC {
> class FunctionExecutable;
>@@ -157,13 +157,13 @@ inline void UnguardedBuiltinBuiltinsWrapper::exportNames()
> #include "UnguardedBuiltinBuiltins.h"
> 
> #include "WebCoreJSClientData.h"
>-#include <heap/HeapInlines.h>
>-#include <runtime/IdentifierInlines.h>
>-#include <runtime/Intrinsic.h>
>-#include <runtime/JSCJSValueInlines.h>
>-#include <runtime/JSCellInlines.h>
>-#include <runtime/StructureInlines.h>
>-#include <runtime/VM.h>
>+#include <JavaScriptCore/HeapInlines.h>
>+#include <JavaScriptCore/IdentifierInlines.h>
>+#include <JavaScriptCore/Intrinsic.h>
>+#include <JavaScriptCore/JSCJSValueInlines.h>
>+#include <JavaScriptCore/JSCellInlines.h>
>+#include <JavaScriptCore/StructureInlines.h>
>+#include <JavaScriptCore/VM.h>
> 
> namespace WebCore {
> 
>diff --git a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result
>index 7e9dbfdd1ef..b24bca3caa5 100644
>--- a/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result
>+++ b/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result
>@@ -33,10 +33,10 @@
> 
> #if ENABLE(STREAMS_API)
> 
>-#include <builtins/BuiltinUtils.h>
>-#include <bytecode/UnlinkedFunctionExecutable.h>
>-#include <runtime/Identifier.h>
>-#include <runtime/JSFunction.h>
>+#include <JavaScriptCore/BuiltinUtils.h>
>+#include <JavaScriptCore/Identifier.h>
>+#include <JavaScriptCore/JSFunction.h>
>+#include <JavaScriptCore/UnlinkedFunctionExecutable.h>
> 
> namespace JSC {
> class FunctionExecutable;
>@@ -209,13 +209,13 @@ inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
> #if ENABLE(STREAMS_API)
> 
> #include "WebCoreJSClientData.h"
>-#include <heap/HeapInlines.h>
>-#include <runtime/IdentifierInlines.h>
>-#include <runtime/Intrinsic.h>
>-#include <runtime/JSCJSValueInlines.h>
>-#include <runtime/JSCellInlines.h>
>-#include <runtime/StructureInlines.h>
>-#include <runtime/VM.h>
>+#include <JavaScriptCore/HeapInlines.h>
>+#include <JavaScriptCore/IdentifierInlines.h>
>+#include <JavaScriptCore/Intrinsic.h>
>+#include <JavaScriptCore/JSCJSValueInlines.h>
>+#include <JavaScriptCore/JSCellInlines.h>
>+#include <JavaScriptCore/StructureInlines.h>
>+#include <JavaScriptCore/VM.h>
> 
> namespace WebCore {
>

Flags:

ysuzuki: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 182445: 332988 | 332994