Attachment 358117 Details for Bug 193045 – Patch

[patch] Patch

bug-193045-20181228181145.patch (text/plain), 23.22 KB, created by Yusuke Suzuki on 2018-12-28 01:11:47 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yusuke Suzuki

Created: 2018-12-28 01:11:47 PST

Size: 23.22 KB

patch

obsolete

>Subversion Revision: 239556
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 17e010891210bef58b46a33cef329ca3a41b7833..49bfbb0a46e3df2b3c683f042aa6de778c6cab18 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,40 @@
>+2018-12-28  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
>+
>+        Add ENABLE_UNIFIED_BUILDS option to cmake ports
>+        https://bugs.webkit.org/show_bug.cgi?id=193045
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add declarations or header imports to build JSCOnly without errors.
>+
>+        * bytecode/BytecodeUseDef.h:
>+        * bytecode/ExecutableToCodeBlockEdge.cpp:
>+        * bytecode/ExitFlag.cpp:
>+        * bytecode/ExitFlag.h:
>+        * bytecode/ICStatusUtils.h:
>+        * dfg/DFGArgumentsUtilities.cpp:
>+        * dfg/DFGCFAPhase.cpp:
>+        * dfg/DFGPureValue.h:
>+        * heap/GCSegmentedArray.h:
>+        * heap/IsoAlignedMemoryAllocator.cpp:
>+        * heap/IsoAlignedMemoryAllocator.h:
>+        * heap/LocalAllocator.cpp:
>+        * heap/LocalAllocator.h:
>+        * heap/LocalAllocatorInlines.h:
>+        * heap/MarkingConstraintSolver.cpp:
>+        * inspector/ScriptArguments.cpp:
>+        (Inspector::ScriptArguments::isEqual const):
>+        * interpreter/CallFrameInlines.h:
>+        * interpreter/StackVisitor.cpp:
>+        * jit/JITPropertyAccess.cpp:
>+        * llint/LLIntEntrypoint.cpp:
>+        * runtime/BigIntPrototype.cpp:
>+        * runtime/JSModuleLoader.h:
>+        * runtime/ObjectConstructor.cpp:
>+        * runtime/StackFrame.h:
>+        * wasm/js/WebAssemblyFunction.h:
>+        * wasm/js/WebAssemblyPrototype.h:
>+
> 2018-12-27  Alex Christensen  <achristensen@webkit.org>
> 
>         Resurrect Mac CMake build
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 4803c26e9159ac9375aca59941896e0b22331842..8f3710625c6905ec2920c695148213791702ae65 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-12-28  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
>+
>+        Add ENABLE_UNIFIED_BUILDS option to cmake ports
>+        https://bugs.webkit.org/show_bug.cgi?id=193045
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/generate-unified-source-bundles.rb:
>+
> 2018-12-27  Alex Christensen  <achristensen@webkit.org>
> 
>         Resurrect Mac CMake build
>diff --git a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>index 22792277c53b3cff99c879738ef64a124692ecd7..b0da85d10038ea3c2bc601b36c256899deff90a7 100644
>--- a/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>+++ b/Source/JavaScriptCore/bytecode/BytecodeUseDef.h
>@@ -25,6 +25,8 @@
> 
> #pragma once
> 
>+#include "BytecodeStructs.h"
>+#include "Bytecodes.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 81bc9a98532b73739149b771b265458323d2ba80..3469e610de3b83aeea3b5dfc6fc474d0cc2d2bfa 100644
>--- a/Source/JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp
>+++ b/Source/JavaScriptCore/bytecode/ExecutableToCodeBlockEdge.cpp
>@@ -26,7 +26,9 @@
> #include "config.h"
> #include "ExecutableToCodeBlockEdge.h"
> 
>+#include "CodeBlock.h"
> #include "IsoCellSetInlines.h"
>+#include "SlotVisitorInlines.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/bytecode/ExitFlag.cpp b/Source/JavaScriptCore/bytecode/ExitFlag.cpp
>index 7551178035c89f2146a656df5da19da413b3b364..628f2f137f9c9826056fa53209524561e668caf7 100644
>--- a/Source/JavaScriptCore/bytecode/ExitFlag.cpp
>+++ b/Source/JavaScriptCore/bytecode/ExitFlag.cpp
>@@ -27,6 +27,7 @@
> #include "ExitFlag.h"
> 
> #include <wtf/CommaPrinter.h>
>+#include <wtf/PrintStream.h>
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/bytecode/ExitFlag.h b/Source/JavaScriptCore/bytecode/ExitFlag.h
>index 5a3d4089cf0152992c24edb01b29b862f6d7c8a4..8692e9d5e9673854ed3f0f23ee5a1a1c95a9e014 100644
>--- a/Source/JavaScriptCore/bytecode/ExitFlag.h
>+++ b/Source/JavaScriptCore/bytecode/ExitFlag.h
>@@ -27,6 +27,11 @@
> 
> #include "ExitingInlineKind.h"
> 
>+namespace WTF {
>+class PrintStream;
>+}
>+using WTF::PrintStream;
>+
> namespace JSC {
> 
> class ExitFlag {
>diff --git a/Source/JavaScriptCore/bytecode/ICStatusUtils.h b/Source/JavaScriptCore/bytecode/ICStatusUtils.h
>index 0e2a98d1e2fb9b34b2107f852d445f1d2d1be61e..9d9bd4bf0f3db0eb8daac96ee18ab34605abef2e 100644
>--- a/Source/JavaScriptCore/bytecode/ICStatusUtils.h
>+++ b/Source/JavaScriptCore/bytecode/ICStatusUtils.h
>@@ -26,6 +26,7 @@
> #pragma once
> 
> #include "ExitFlag.h"
>+#include "StructureSet.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp b/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp
>index cc75f47c3f2dbfcc69689e4581faa7d5c8526acb..815de8ce13139ad33f884949e6583ac58b8cd53f 100644
>--- a/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGArgumentsUtilities.cpp
>@@ -29,6 +29,7 @@
> #if ENABLE(DFG_JIT)
> 
> #include "JSCInlines.h"
>+#include "JSImmutableButterfly.h"
> 
> namespace JSC { namespace DFG {
> 
>diff --git a/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp b/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp
>index 27232f878e354c0297eaf09a47da0f74801f4ef4..8dac983b24f7e4514083e5eb63a7f444efe633d2 100644
>--- a/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp
>+++ b/Source/JavaScriptCore/dfg/DFGCFAPhase.cpp
>@@ -31,6 +31,7 @@
> #include "DFGAbstractInterpreterInlines.h"
> #include "DFGBlockSet.h"
> #include "DFGClobberSet.h"
>+#include "DFGClobberize.h"
> #include "DFGGraph.h"
> #include "DFGInPlaceAbstractState.h"
> #include "DFGPhase.h"
>diff --git a/Source/JavaScriptCore/dfg/DFGPureValue.h b/Source/JavaScriptCore/dfg/DFGPureValue.h
>index bcb004a998329bca503f5700135d6e940243e0fb..0a2171c9cd6eb0e63e759767051deee7390c1422 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 359e83e1b35ed136d94e5bbf5a621cab987bd007..af2c9621613b2d9799906711ce3fbc44496dd2e2 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 abddece9533d8aa771e1d9f8ecefdaaf13caa6c8..85923351bbf40522356f5095bd03a3b87f815e75 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 09073b946f080d39a6f7128a49a2e7674dae5cf1..b8a0710b698ab3757bf725ff4d66d784ab418d6b 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/HashMap.h>
>+#include <wtf/Lock.h>
>+#include <wtf/Vector.h>
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/heap/LocalAllocator.cpp b/Source/JavaScriptCore/heap/LocalAllocator.cpp
>index bfc749f46a4acb161b80c374a8c8967a9a454e4d..5b204abacb82f1126df139dbe2dc07a9d872487d 100644
>--- a/Source/JavaScriptCore/heap/LocalAllocator.cpp
>+++ b/Source/JavaScriptCore/heap/LocalAllocator.cpp
>@@ -27,8 +27,12 @@
> #include "LocalAllocator.h"
> 
> #include "AllocatingScope.h"
>+#include "FreeListInlines.h"
>+#include "GCDeferralContext.h"
> #include "LocalAllocatorInlines.h"
> #include "Options.h"
>+#include "Subspace.h"
>+#include "SuperSampler.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/heap/LocalAllocator.h b/Source/JavaScriptCore/heap/LocalAllocator.h
>index 9d8f5a4cef03ecf7c8ff145a4f419ef8fa486294..a7e67ea3eb6efe1717caed7a766abc950bf1b460 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 c97b69e102b6bb171fe00738f0e3e86f5635f53b..7092318d9819bc182c0c07cd93645e115338da2f 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 a7ff046e59f8446850d53697fc3ab5fc9d7539a6..cbbbd31c6fead1f016168766aeba680f1d8deffc 100644
>--- a/Source/JavaScriptCore/heap/MarkingConstraintSolver.cpp
>+++ b/Source/JavaScriptCore/heap/MarkingConstraintSolver.cpp
>@@ -27,6 +27,7 @@
> #include "MarkingConstraintSolver.h"
> 
> #include "JSCInlines.h"
>+#include "MarkingConstraintSet.h"
> 
> namespace JSC { 
> 
>diff --git a/Source/JavaScriptCore/inspector/ScriptArguments.cpp b/Source/JavaScriptCore/inspector/ScriptArguments.cpp
>index cf49d96d44f46d3645f4efed8a7098cb0b979b34..684ce9a568225b6f6374f1db46be8cc476c621bc 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 abdec1bc86038c36ee43575dac1bad84a0355497..c0cbbd5789210968f90098c3babf61e8214ccdd8 100644
>--- a/Source/JavaScriptCore/interpreter/CallFrameInlines.h
>+++ b/Source/JavaScriptCore/interpreter/CallFrameInlines.h
>@@ -26,6 +26,8 @@
> #pragma once
> 
> #include "CallFrame.h"
>+#include "JSCallee.h"
>+#include "JSGlobalObject.h"
> 
> namespace JSC {
> 
>diff --git a/Source/JavaScriptCore/interpreter/StackVisitor.cpp b/Source/JavaScriptCore/interpreter/StackVisitor.cpp
>index 2e110b78142cb826694e3eeba8e37170e13b5cb3..f8d6557586b4a8bf1495f0e483421a9ef250222d 100644
>--- a/Source/JavaScriptCore/interpreter/StackVisitor.cpp
>+++ b/Source/JavaScriptCore/interpreter/StackVisitor.cpp
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "StackVisitor.h"
> 
>+#include "CallFrameInlines.h"
> #include "ClonedArguments.h"
> #include "DebuggerPrimitives.h"
> #include "InlineCallFrame.h"
>diff --git a/Source/JavaScriptCore/jit/JITPropertyAccess.cpp b/Source/JavaScriptCore/jit/JITPropertyAccess.cpp
>index bd785be866d6d83e6a6941a977300b5ad42ab49f..0c3a5d5b83768be2c063dd1d384b31282fdc538f 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 f7ad74c5ae2ce7b6a1048131f45e9db52261f4cd..c428194133f5c8de02f5fce1c3482cb01fa48a94 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/BigIntPrototype.cpp b/Source/JavaScriptCore/runtime/BigIntPrototype.cpp
>index 7e15288585e5f4a739762389a6844b38fc70a9a0..215c09504d8c17458582a5cf76f1b966a691429a 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/JSModuleLoader.h b/Source/JavaScriptCore/runtime/JSModuleLoader.h
>index 4dcd522afea24bb6c86263cc4796aeca7acc5460..33ebc42e075bb8320a7d8636c61953ae3336cadf 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/ObjectConstructor.cpp b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
>index c4a4905272ab2ba86137be8ec38729c65c12e07e..cfa4fb301d3abeb3ddddb0821e13529a544531e0 100644
>--- a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
>+++ b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
>@@ -36,6 +36,7 @@
> #include "PropertyDescriptor.h"
> #include "PropertyNameArray.h"
> #include "StackVisitor.h"
>+#include "StructureRareDataInlines.h"
> #include "Symbol.h"
> 
> namespace JSC {
>diff --git a/Source/JavaScriptCore/runtime/StackFrame.h b/Source/JavaScriptCore/runtime/StackFrame.h
>index ed982e31f55bbbc91628d23417812bb4f6c68711..5eedee6f8186daea30409813d45346ac075efd80 100644
>--- a/Source/JavaScriptCore/runtime/StackFrame.h
>+++ b/Source/JavaScriptCore/runtime/StackFrame.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include "Heap.h"
> #include "WasmIndexOrName.h"
> #include "WriteBarrier.h"
> #include <limits.h>
>diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.h b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.h
>index 344390099ea133ac9d3f60530fddad359cc6c64f..51c5d302ba61c0792b9fcf9513ff13b30d8bd52e 100644
>--- a/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.h
>+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.h
>@@ -27,6 +27,7 @@
> 
> #if ENABLE(WEBASSEMBLY)
> 
>+#include "ArityCheckMode.h"
> #include "MacroAssemblerCodeRef.h"
> #include "WasmCallee.h"
> #include "WebAssemblyFunctionBase.h"
>diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.h b/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.h
>index 5f7c56a6933faae85bc9ec215f92a0d3842a2898..dc43898c0e25d770587ca8af748f4c4c622498d6 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;
>diff --git a/Source/WTF/Scripts/generate-unified-source-bundles.rb b/Source/WTF/Scripts/generate-unified-source-bundles.rb
>index 8880e6f7488f11b7f4f9b597b0b9b2cba15713bc..6ffbf086f4b7df7dd71d4741426249c7c1f8be04 100644
>--- a/Source/WTF/Scripts/generate-unified-source-bundles.rb
>+++ b/Source/WTF/Scripts/generate-unified-source-bundles.rb
>@@ -45,6 +45,7 @@ def usage(message)
>     puts
>     puts "Optional arguments:"
>     puts "--print-bundled-sources              Print bundled sources rather than generating sources"
>+    puts "--print-all-sources                  Print all sources rather than generating sources"
>     puts "--generate-xcfilelists               Generate .xcfilelist files"
>     puts "--input-xcfilelist-path              Path of the generated input .xcfilelist file"
>     puts "--output-xcfilelist-path             Path of the generated output .xcfilelist file"
>@@ -78,6 +79,7 @@ def log(text)
>                ['--source-tree-path', '-s', GetoptLong::REQUIRED_ARGUMENT],
>                ['--feature-flags', '-f', GetoptLong::REQUIRED_ARGUMENT],
>                ['--print-bundled-sources', GetoptLong::NO_ARGUMENT],
>+               ['--print-all-sources', GetoptLong::NO_ARGUMENT],
>                ['--generate-xcfilelists', GetoptLong::NO_ARGUMENT],
>                ['--input-xcfilelist-path', GetoptLong::REQUIRED_ARGUMENT],
>                ['--output-xcfilelist-path', GetoptLong::REQUIRED_ARGUMENT],
>@@ -98,6 +100,8 @@ def log(text)
>         arg.gsub(/\s+/, ";").split(";").map { |x| $featureFlags[x] = true }
>     when '--print-bundled-sources'
>         $mode = :PrintBundledSources
>+    when '--print-all-sources'
>+        $mode = :PrintAllSources
>     when '--generate-xcfilelists'
>         $mode = :GenerateXCFilelists
>     when '--input-xcfilelist-path'
>@@ -323,6 +327,8 @@ def ProcessFileForUnifiedSourceGeneration(sourceFile)
>     case $mode
>     when :GenerateBundles, :GenerateXCFilelists
>         ProcessFileForUnifiedSourceGeneration(sourceFile)
>+    when :PrintAllSources
>+        $generatedSources << sourceFile
>     when :PrintBundledSources
>         $generatedSources << sourceFile if $bundleManagers[sourceFile.path.extname] && sourceFile.unifiable
>     end
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index 657ed0cfbf47f876614a75739a6c5f8ef02a8dcb..4a3f88efc15a93564947f794675b4e1caa72d789 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -192,6 +192,7 @@ macro(WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle automatic text size adjustment support" PRIVATE OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" PRIVATE OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_SLIDER "Toggle Touch Slider support" PRIVATE OFF)
>+    WEBKIT_OPTION_DEFINE(ENABLE_UNIFIED_BUILDS "Toggle unified builds" PRIVATE ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_USERSELECT_ALL "Toggle user-select:all support" PRIVATE ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_USER_MESSAGE_HANDLERS "Toggle user script message handler support" PRIVATE ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_VARIATION_FONTS "Toggle variation fonts support" PRIVATE OFF)
>diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
>index 36e5a0200c92cd692445c1458741a3feab9e29ee..6d58d57e63737e4cc05bcd408a1125be4ced3cca 100644
>--- a/Source/cmake/WebKitMacros.cmake
>+++ b/Source/cmake/WebKitMacros.cmake
>@@ -16,41 +16,59 @@ macro(WEBKIT_COMPUTE_SOURCES _framework)
>         set(WTF_SCRIPTS_DIR "${FORWARDING_HEADERS_DIR}/wtf/Scripts")
>     endif ()
> 
>-    execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
>-        "--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}"
>-        "--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
>-        "--print-bundled-sources"
>-        "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
>-        ${_sourceListFileTruePaths}
>-        RESULT_VARIABLE _resultTmp
>-        OUTPUT_VARIABLE _outputTmp)
>-
>-    if (${_resultTmp})
>-         message(FATAL_ERROR "generate-unified-source-bundles.rb exited with non-zero status, exiting")
>-    endif ()
>+    if (ENABLE_UNIFIED_BUILDS)
>+        execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
>+            "--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}"
>+            "--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
>+            "--print-bundled-sources"
>+            "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
>+            ${_sourceListFileTruePaths}
>+            RESULT_VARIABLE _resultTmp
>+            OUTPUT_VARIABLE _outputTmp)
>+
>+        if (${_resultTmp})
>+             message(FATAL_ERROR "generate-unified-source-bundles.rb exited with non-zero status, exiting")
>+        endif ()
> 
>-    foreach (_sourceFileTmp IN LISTS _outputTmp)
>-        set_source_files_properties(${_sourceFileTmp} PROPERTIES HEADER_FILE_ONLY ON)
>-        list(APPEND ${_framework}_HEADERS ${_sourceFileTmp})
>-    endforeach ()
>-    unset(_sourceFileTmp)
>-
>-    execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
>-        "--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}"
>-        "--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
>-        "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
>-        ${_sourceListFileTruePaths}
>-        RESULT_VARIABLE  _resultTmp
>-        OUTPUT_VARIABLE _outputTmp)
>-
>-    if (${_resultTmp})
>-        message(FATAL_ERROR "generate-unified-source-bundles.rb exited with non-zero status, exiting")
>-    endif ()
>+        foreach (_sourceFileTmp IN LISTS _outputTmp)
>+            set_source_files_properties(${_sourceFileTmp} PROPERTIES HEADER_FILE_ONLY ON)
>+            list(APPEND ${_framework}_HEADERS ${_sourceFileTmp})
>+        endforeach ()
>+        unset(_sourceFileTmp)
>+
>+        execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
>+            "--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}"
>+            "--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
>+            "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
>+            ${_sourceListFileTruePaths}
>+            RESULT_VARIABLE  _resultTmp
>+            OUTPUT_VARIABLE _outputTmp)
>+
>+        if (${_resultTmp})
>+            message(FATAL_ERROR "generate-unified-source-bundles.rb exited with non-zero status, exiting")
>+        endif ()
> 
>-    list(APPEND ${_framework}_SOURCES ${_outputTmp})
>-    unset(_platformSourcesFile)
>-    unset(_resultTmp)
>-    unset(_outputTmp)
>+        list(APPEND ${_framework}_SOURCES ${_outputTmp})
>+        unset(_resultTmp)
>+        unset(_outputTmp)
>+    else ()
>+        execute_process(COMMAND ${RUBY_EXECUTABLE} ${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
>+            "--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}"
>+            "--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
>+            "--print-all-sources"
>+            "--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
>+            ${_sourceListFileTruePaths}
>+            RESULT_VARIABLE _resultTmp
>+            OUTPUT_VARIABLE _outputTmp)
>+
>+        if (${_resultTmp})
>+             message(FATAL_ERROR "generate-unified-source-bundles.rb exited with non-zero status, exiting")
>+        endif ()
>+
>+        list(APPEND ${_framework}_SOURCES ${_outputTmp})
>+        unset(_resultTmp)
>+        unset(_outputTmp)
>+    endif ()
> endmacro()
> 
> macro(WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS)
>diff --git a/ChangeLog b/ChangeLog
>index 1079b98a15d104d94ac501bcab06e6477a08f0f4..dacdb97146c881cb478c26346d99d50ee98103c1 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-12-28  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
>+
>+        Add ENABLE_UNIFIED_BUILDS option to cmake ports
>+        https://bugs.webkit.org/show_bug.cgi?id=193045
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch adds ENABLE_UNIFIED_BUILDS option to cmake ports, which allows us to disable Unified Builds in WebKit.
>+        This makes `compile_commands.json` sane when the unified builds is disabled, and various tools can use this
>+        compilation database. For example, YouCompleteMe completion server can use it.
>+
>+        * Source/cmake/WebKitFeatures.cmake:
>+        * Source/cmake/WebKitMacros.cmake:
>+
> 2018-12-27  Alex Christensen  <achristensen@webkit.org>
> 
>         Resurrect Mac CMake build

Actions: View | Formatted Diff | Diff

Attachments on bug 193045: 358115 | 358116 | 358117 | 358118