Attachment 358181 Details for Bug 193073 – WIP

[patch] WIP

0001-WIP.patch (text/plain), 13.79 KB, created by Carlos Bentzen on 2019-01-02 05:34:20 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Bentzen

Created: 2019-01-02 05:34:20 PST

Size: 13.79 KB

patch

obsolete

>From 40738a663866f367a05d69fc8d65ffa5759a069b Mon Sep 17 00:00:00 2001
>From: Carlos Eduardo Ramalho <cadubentzen@gmail.com>
>Date: Wed, 2 Jan 2019 10:11:09 -0300
>Subject: [PATCH xserver] WIP
>
>---
> Source/JavaScriptCore/API/APIUtils.h                       | 2 +-
> Source/JavaScriptCore/bytecode/BytecodeUseDef.h            | 1 +
> .../JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp  | 1 +
> Source/JavaScriptCore/bytecode/ExitFlag.cpp                | 3 ++-
> Source/JavaScriptCore/bytecode/ExitFlag.h                  | 6 +++++-
> Source/JavaScriptCore/bytecode/ICStatusUtils.h             | 3 +++
> Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp        | 1 +
> Source/JavaScriptCore/dfg/DFGCFAPhase.cpp                  | 1 +
> Source/JavaScriptCore/dfg/DFGPureValue.h                   | 1 +
> Source/JavaScriptCore/heap/GCSegmentedArray.h              | 1 +
> Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp   | 2 ++
> Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.h     | 4 ++++
> Source/JavaScriptCore/heap/LocalAllocator.cpp              | 7 +++++++
> Source/JavaScriptCore/heap/LocalAllocator.h                | 1 +
> Source/JavaScriptCore/heap/LocalAllocatorInlines.h         | 1 +
> Source/JavaScriptCore/heap/MarkingConstraintSolver.cpp     | 2 ++
> Source/JavaScriptCore/inspector/ScriptArguments.cpp        | 2 +-
> Source/JavaScriptCore/interpreter/CallFrameInlines.h       | 1 +
> Source/JavaScriptCore/jit/JITPropertyAccess.cpp            | 1 +
> Source/JavaScriptCore/llint/LLIntEntrypoint.cpp            | 1 +
> Source/JavaScriptCore/runtime/ArrayPrototype.h             | 2 +-
> Source/JavaScriptCore/runtime/BigIntPrototype.cpp          | 1 +
> Source/JavaScriptCore/runtime/JSCallee.h                   | 4 +---
> Source/JavaScriptCore/runtime/JSModuleLoader.h             | 1 +
> Source/JavaScriptCore/runtime/StackFrame.h                 | 1 +
> Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.h       | 2 ++
> 26 files changed, 45 insertions(+), 8 deletions(-)
>
>diff --git a/Source/JavaScriptCore/API/APIUtils.h b/Source/JavaScriptCore/API/APIUtils.h
>index 272639611ea..7a5e8ba8b82 100644
>--- a/Source/JavaScriptCore/API/APIUtils.h
>+++ b/Source/JavaScriptCore/API/APIUtils.h
>@@ -57,7 +57,7 @@ inline void setException(JSC::ExecState* exec, JSValueRef* returnedExceptionRef,
>     if (returnedExceptionRef)
>         *returnedExceptionRef = toRef(exec, exception);
> #if ENABLE(REMOTE_INSPECTOR)
>-    VM& vm = exec->vm();
>+    JSC::VM& vm = exec->vm();
>     vm.vmEntryGlobalObject(exec)->inspectorController().reportAPIException(exec, JSC::Exception::create(vm, exception));
> #endif
> }
>diff --git a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>index 22792277c53..63d9a6388f7 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>+++ b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include "BytecodeStructs.h"
> #include "CodeBlock.h"
> #include "Instruction.h"
> #include <wtf/Forward.h>
>diff --git a/Source/JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp b/Source/JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp
>index 81bc9a98532..14b757447dc 100644
>--- a/Source/JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp
>+++ b/Source/JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "ExecutableToCodeBlockEdge.h"
> 
>+#include "CodeBlock.h"
> #include "IsoCellSetInlines.h"
> 
> namespace JSC {
>diff --git a/Source/JavaScriptCore/bytecode/ExitFlag.cpp b/Source/JavaScriptCore/bytecode/ExitFlag.cpp
>index 7551178035c..c0c7b9b84b7 100644
>--- a/Source/JavaScriptCore/bytecode/ExitFlag.cpp
>+++ b/Source/JavaScriptCore/bytecode/ExitFlag.cpp
>@@ -27,10 +27,11 @@
> #include "ExitFlag.h"
> 
> #include <wtf/CommaPrinter.h>
>+#include <wtf/PrintStream.h>
> 
> namespace JSC {
> 
>-void ExitFlag::dump(PrintStream& out) const
>+void ExitFlag::dump(WTF::PrintStream& out) const
> {
>     if (!m_bits) {
>         out.print("false");
>diff --git a/Source/JavaScriptCore/bytecode/ExitFlag.h b/Source/JavaScriptCore/bytecode/ExitFlag.h
>index 5a3d4089cf0..2e8a3cae62c 100644
>--- a/Source/JavaScriptCore/bytecode/ExitFlag.h
>+++ b/Source/JavaScriptCore/bytecode/ExitFlag.h
>@@ -27,6 +27,10 @@
> 
> #include "ExitingInlineKind.h"
> 
>+namespace WTF {
>+    class PrintStream;
>+}
>+
> namespace JSC {
> 
> class ExitFlag {
>@@ -87,7 +91,7 @@ public:
>         return !!(*this & ExitFlag(true, inlineKind));
>     }
>     
>-    void dump(PrintStream&) const;
>+    void dump(WTF::PrintStream&) const;
>     
> private:
>     static constexpr uint8_t trueNotInlined = 1;
>diff --git a/Source/JavaScriptCore/bytecode/ICStatusUtils.h b/Source/JavaScriptCore/bytecode/ICStatusUtils.h
>index 0e2a98d1e2f..077cbe1abad 100644
>--- a/Source/JavaScriptCore/bytecode/ICStatusUtils.h
>+++ b/Source/JavaScriptCore/bytecode/ICStatusUtils.h
>@@ -29,6 +29,9 @@
> 
> namespace JSC {
> 
>+class CodeBlock;
>+class StructureSet;
>+
> template<typename VariantVectorType, typename VariantType>
> bool appendICStatusVariant(VariantVectorType& variants, const VariantType& variant)
> {
>diff --git a/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp b/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp
>index cc75f47c3f2..3c2c7be98fe 100644
>--- a/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp
>@@ -28,6 +28,7 @@
> 
> #if ENABLE(DFG_JIT)
> 
>+#include "JSImmutableButterfly.h"
> #include "JSCInlines.h"
> 
> namespace JSC { namespace DFG {
>diff --git a/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp b/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp
>index 27232f878e3..c19464d92ad 100644
>--- a/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp
>@@ -30,6 +30,7 @@
> 
> #include "DFGAbstractInterpreterInlines.h"
> #include "DFGBlockSet.h"
>+#include "DFGClobberize.h"
> #include "DFGClobberSet.h"
> #include "DFGGraph.h"
> #include "DFGInPlaceAbstractState.h"
>diff --git a/Source/JavaScriptCore/dfg/DFGPureValue.h b/Source/JavaScriptCore/dfg/DFGPureValue.h
>index bcb004a9983..0a2171c9cd6 100644
>--- a/Source/JavaScriptCore/dfg/DFGPureValue.h
>+++ b/Source/JavaScriptCore/dfg/DFGPureValue.h
>@@ -27,6 +27,7 @@
> 
> #if ENABLE(DFG_JIT)
> 
>+#include "DFGGraph.h"
> #include "DFGNode.h"
> 
> namespace JSC { namespace DFG {
>diff --git a/Source/JavaScriptCore/heap/GCSegmentedArray.h b/Source/JavaScriptCore/heap/GCSegmentedArray.h
>index 359e83e1b35..af2c9621613 100644
>--- a/Source/JavaScriptCore/heap/GCSegmentedArray.h
>+++ b/Source/JavaScriptCore/heap/GCSegmentedArray.h
>@@ -27,6 +27,7 @@
> 
> #include <wtf/DoublyLinkedList.h>
> #include <wtf/Forward.h>
>+#include <wtf/Noncopyable.h>
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp b/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp
>index abddece9533..85923351bbf 100644
>--- a/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp
>+++ b/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.cpp
>@@ -26,6 +26,8 @@
> #include "config.h"
> #include "IsoAlignedMemoryAllocator.h"
> 
>+#include "MarkedBlock.h"
>+
> namespace JSC {
> 
> IsoAlignedMemoryAllocator::IsoAlignedMemoryAllocator()
>diff --git a/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.h b/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.h
>index 09073b946f0..f84906526f1 100644
>--- a/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.h
>+++ b/Source/JavaScriptCore/heap/IsoAlignedMemoryAllocator.h
>@@ -26,6 +26,10 @@
> #pragma once
> 
> #include "AlignedMemoryAllocator.h"
>+#include <wtf/FastBitVector.h>
>+#include <wtf/Lock.h>
>+#include <wtf/HashMap.h>
>+#include <wtf/Vector.h>
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/heap/LocalAllocator.cpp b/Source/JavaScriptCore/heap/LocalAllocator.cpp
>index bfc749f46a4..2db9fec81e3 100644
>--- a/Source/JavaScriptCore/heap/LocalAllocator.cpp
>+++ b/Source/JavaScriptCore/heap/LocalAllocator.cpp
>@@ -26,9 +26,16 @@
> #include "config.h"
> #include "LocalAllocator.h"
> 
>+#include "AlignedMemoryAllocator.h"
>+#include "Heap.h"
>+#include "JSCInlines.h"
>+#include "Operations.h"
>+
> #include "AllocatingScope.h"
>+#include "GCDeferralContext.h"
> #include "LocalAllocatorInlines.h"
> #include "Options.h"
>+#include "SuperSampler.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/heap/LocalAllocator.h b/Source/JavaScriptCore/heap/LocalAllocator.h
>index 9d8f5a4cef0..a7e67ea3eb6 100644
>--- a/Source/JavaScriptCore/heap/LocalAllocator.h
>+++ b/Source/JavaScriptCore/heap/LocalAllocator.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include "AllocationFailureMode.h"
> #include "FreeList.h"
> #include "MarkedBlock.h"
> #include <wtf/Noncopyable.h>
>diff --git a/Source/JavaScriptCore/heap/LocalAllocatorInlines.h b/Source/JavaScriptCore/heap/LocalAllocatorInlines.h
>index c97b69e102b..7092318d981 100644
>--- a/Source/JavaScriptCore/heap/LocalAllocatorInlines.h
>+++ b/Source/JavaScriptCore/heap/LocalAllocatorInlines.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "LocalAllocator.h"
>+#include "VM.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/heap/MarkingConstraintSolver.cpp b/Source/JavaScriptCore/heap/MarkingConstraintSolver.cpp
>index a7ff046e59f..bb62d99458e 100644
>--- a/Source/JavaScriptCore/heap/MarkingConstraintSolver.cpp
>+++ b/Source/JavaScriptCore/heap/MarkingConstraintSolver.cpp
>@@ -27,6 +27,8 @@
> #include "MarkingConstraintSolver.h"
> 
> #include "JSCInlines.h"
>+#include "MarkingConstraint.h"
>+#include "MarkingConstraintSet.h"
> 
> namespace JSC { 
> 
>diff --git a/Source/JavaScriptCore/inspector/ScriptArguments.cpp b/Source/JavaScriptCore/inspector/ScriptArguments.cpp
>index cf49d96d44f..684ce9a5682 100644
>--- a/Source/JavaScriptCore/inspector/ScriptArguments.cpp
>+++ b/Source/JavaScriptCore/inspector/ScriptArguments.cpp
>@@ -110,7 +110,7 @@ bool ScriptArguments::isEqual(const ScriptArguments& other) const
>                 return false;
>         } else {
>             auto scope = DECLARE_CATCH_SCOPE(state->vm());
>-            bool result = JSValue::strictEqual(state, a, b);
>+            bool result = JSC::JSValue::strictEqual(state, a, b);
>             scope.clearException();
>             if (!result)
>                 return false;
>diff --git a/Source/JavaScriptCore/interpreter/CallFrameInlines.h b/Source/JavaScriptCore/interpreter/CallFrameInlines.h
>index abdec1bc860..70a5814f58d 100644
>--- a/Source/JavaScriptCore/interpreter/CallFrameInlines.h
>+++ b/Source/JavaScriptCore/interpreter/CallFrameInlines.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "CallFrame.h"
>+#include "JSObject.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
>index bd785be866d..0c3a5d5b837 100644
>--- a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
>+++ b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
>@@ -44,6 +44,7 @@
> #include "ScopedArgumentsTable.h"
> #include "SlowPathCall.h"
> #include "StructureStubInfo.h"
>+#include "ThunkGenerators.h"
> #include <wtf/ScopedLambda.h>
> #include <wtf/StringPrintStream.h>
> 
>diff --git a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
>index f7ad74c5ae2..c428194133f 100644
>--- a/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
>+++ b/Source/JavaScriptCore/llint/LLIntEntrypoint.cpp
>@@ -30,6 +30,7 @@
> #include "JITCode.h"
> #include "JSCellInlines.h"
> #include "JSObject.h"
>+#include "LLIntData.h"
> #include "LLIntThunks.h"
> #include "LowLevelInterpreter.h"
> #include "MaxFrameExtentForSlowPathCall.h"
>diff --git a/Source/JavaScriptCore/runtime/ArrayPrototype.h b/Source/JavaScriptCore/runtime/ArrayPrototype.h
>index b0fd8a585e7..681c696e560 100644
>--- a/Source/JavaScriptCore/runtime/ArrayPrototype.h
>+++ b/Source/JavaScriptCore/runtime/ArrayPrototype.h
>@@ -20,7 +20,7 @@
> 
> #pragma once
> 
>-#include "JSArray.h"
>+#include "JSArrayInlines.h"
> #include "JSCPoison.h"
> #include <wtf/PoisonedUniquePtr.h>
> 
>diff --git a/Source/JavaScriptCore/runtime/BigIntPrototype.cpp b/Source/JavaScriptCore/runtime/BigIntPrototype.cpp
>index 7e15288585e..215c09504d8 100644
>--- a/Source/JavaScriptCore/runtime/BigIntPrototype.cpp
>+++ b/Source/JavaScriptCore/runtime/BigIntPrototype.cpp
>@@ -27,6 +27,7 @@
> #include "config.h"
> #include "BigIntPrototype.h"
> 
>+#include "BigIntObject.h"
> #include "Error.h"
> #include "JSBigInt.h"
> #include "JSCBuiltins.h"
>diff --git a/Source/JavaScriptCore/runtime/JSCallee.h b/Source/JavaScriptCore/runtime/JSCallee.h
>index d783dc40462..abcfecf09f1 100644
>--- a/Source/JavaScriptCore/runtime/JSCallee.h
>+++ b/Source/JavaScriptCore/runtime/JSCallee.h
>@@ -25,16 +25,14 @@
> 
> #pragma once
> 
>-#include "JSGlobalObject.h"
>+#include "JSGlobalObjectInlines.h"
> #include "JSObject.h"
> #include "JSScope.h"
> 
> namespace JSC {
> 
>-class JSGlobalObject;
> class LLIntOffsetsExtractor;
> 
>-
> class JSCallee : public JSNonFinalObject {
>     friend class JIT;
> #if ENABLE(DFG_JIT)
>diff --git a/Source/JavaScriptCore/runtime/JSModuleLoader.h b/Source/JavaScriptCore/runtime/JSModuleLoader.h
>index 4dcd522afea..33ebc42e075 100644
>--- a/Source/JavaScriptCore/runtime/JSModuleLoader.h
>+++ b/Source/JavaScriptCore/runtime/JSModuleLoader.h
>@@ -32,6 +32,7 @@ namespace JSC {
> 
> class JSInternalPromise;
> class JSModuleNamespaceObject;
>+class JSModuleRecord;
> class SourceCode;
> 
> class JSModuleLoader final : public JSNonFinalObject {
>diff --git a/Source/JavaScriptCore/runtime/StackFrame.h b/Source/JavaScriptCore/runtime/StackFrame.h
>index ed982e31f55..adfea83d21b 100644
>--- a/Source/JavaScriptCore/runtime/StackFrame.h
>+++ b/Source/JavaScriptCore/runtime/StackFrame.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include "HeapInlines.h"
> #include "WasmIndexOrName.h"
> #include "WriteBarrier.h"
> #include <limits.h>
>diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.h b/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.h
>index 5f7c56a6933..dc43898c0e2 100644
>--- a/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.h
>+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.h
>@@ -33,6 +33,8 @@
> 
> namespace JSC {
> 
>+class JSPromiseDeferred;
>+
> class WebAssemblyPrototype final : public JSNonFinalObject {
> public:
>     typedef JSNonFinalObject Base;
>-- 
>2.20.1
>

Actions: View | Formatted Diff | Diff

Attachments on bug 193073: 358181 | 358558 | 366870 | 366897 | 366909 | 366946 | 367011