Title: [281647] trunk/Source/_javascript_Core
- Revision
- 281647
- Author
- [email protected]
- Date
- 2021-08-26 12:37:16 -0700 (Thu, 26 Aug 2021)
Log Message
[AppleWin] JSC build failure
https://bugs.webkit.org/show_bug.cgi?id=229578
Reviewed by Don Olmstead.
Add new build dependency between LLIntOffsetsExtractor and JSCBuiltins targets.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (281646 => 281647)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2021-08-26 19:33:37 UTC (rev 281646)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2021-08-26 19:37:16 UTC (rev 281647)
@@ -309,6 +309,70 @@
COMMAND ${RUBY_EXECUTABLE} ${_javascript_CORE_DIR}/offlineasm/generate_offset_extractor.rb -I${_javascript_Core_DERIVED_SOURCES_DIR}/ ${_javascript_CORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntSettingsExtractor> ${_javascript_Core_DERIVED_SOURCES_DIR}/LLIntDesiredOffsets.h ${OFFLINE_ASM_BACKEND} ${BUILD_VARIANTS}
VERBATIM)
+# JSCBuiltins
+
+set(BUILTINS_GENERATOR_SCRIPTS
+ ${_javascript_Core_SCRIPTS_DIR}/wkbuiltins.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generator.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_model.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_templates.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_combined_header.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_combined_implementation.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_header.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_implementation.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_wrapper_header.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_wrapper_implementation.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_internals_wrapper_header.py
+ ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_internals_wrapper_implementation.py
+ ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
+ ${_javascript_Core_SCRIPTS_DIR}/lazywriter.py
+)
+
+set(_javascript_Core_BUILTINS_SOURCES
+ ${_javascript_CORE_DIR}/builtins/AsyncFromSyncIteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/ArrayConstructor.js
+ ${_javascript_CORE_DIR}/builtins/ArrayIteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/ArrayPrototype.js
+ ${_javascript_CORE_DIR}/builtins/AsyncFunctionPrototype.js
+ ${_javascript_CORE_DIR}/builtins/AsyncIteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/AsyncGeneratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/DatePrototype.js
+ ${_javascript_CORE_DIR}/builtins/FunctionPrototype.js
+ ${_javascript_CORE_DIR}/builtins/GeneratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/GlobalObject.js
+ ${_javascript_CORE_DIR}/builtins/GlobalOperations.js
+ ${_javascript_CORE_DIR}/builtins/InternalPromiseConstructor.js
+ ${_javascript_CORE_DIR}/builtins/IteratorHelpers.js
+ ${_javascript_CORE_DIR}/builtins/IteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/MapIteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/MapPrototype.js
+ ${_javascript_CORE_DIR}/builtins/ModuleLoader.js
+ ${_javascript_CORE_DIR}/builtins/NumberConstructor.js
+ ${_javascript_CORE_DIR}/builtins/ObjectConstructor.js
+ ${_javascript_CORE_DIR}/builtins/PromiseConstructor.js
+ ${_javascript_CORE_DIR}/builtins/PromiseOperations.js
+ ${_javascript_CORE_DIR}/builtins/PromisePrototype.js
+ ${_javascript_CORE_DIR}/builtins/ReflectObject.js
+ ${_javascript_CORE_DIR}/builtins/RegExpPrototype.js
+ ${_javascript_CORE_DIR}/builtins/RegExpStringIteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/SetIteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/SetPrototype.js
+ ${_javascript_CORE_DIR}/builtins/StringConstructor.js
+ ${_javascript_CORE_DIR}/builtins/StringIteratorPrototype.js
+ ${_javascript_CORE_DIR}/builtins/StringPrototype.js
+ ${_javascript_CORE_DIR}/builtins/TypedArrayConstructor.js
+ ${_javascript_CORE_DIR}/builtins/TypedArrayPrototype.js
+ ${_javascript_CORE_DIR}/builtins/WebAssembly.js
+)
+
+add_custom_command(
+ OUTPUT ${_javascript_Core_DERIVED_SOURCES_DIR}/JSCBuiltins.cpp ${_javascript_Core_DERIVED_SOURCES_DIR}/JSCBuiltins.h
+ MAIN_DEPENDENCY ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
+ DEPENDS ${_javascript_Core_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS}
+ COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --framework _javascript_Core --output-directory ${_javascript_Core_DERIVED_SOURCES_DIR} --combined ${_javascript_Core_BUILTINS_SOURCES}
+ VERBATIM)
+add_custom_target(JSCBuiltins DEPENDS "${_javascript_Core_DERIVED_SOURCES_DIR}/JSCBuiltins.h")
+
# We add the header files directly to the ADD_EXECUTABLE call instead of setting the
# OBJECT_DEPENDS property in LLIntOffsetsExtractor.cpp because generate_offset_extractor.rb and
# generate-bytecode-files may not regenerate the .h files in case the hash it calculates does not change.
@@ -342,7 +406,7 @@
$<TARGET_PROPERTY:_javascript_Core,INCLUDE_DIRECTORIES>
)
set(LLIntOffsetsExtractor_FRAMEWORKS ${_javascript_Core_FRAMEWORKS})
-set(LLIntOffsetsExtractor_DEPENDENCIES _javascript_Core_CopyHeaders)
+set(LLIntOffsetsExtractor_DEPENDENCIES _javascript_Core_CopyHeaders JSCBuiltins)
WEBKIT_EXECUTABLE(LLIntOffsetsExtractor)
# The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
@@ -1296,70 +1360,6 @@
VERBATIM)
add_custom_target(InspectorBackendCommands DEPENDS "${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendCommands.js")
-# JSCBuiltins
-
-set(BUILTINS_GENERATOR_SCRIPTS
- ${_javascript_Core_SCRIPTS_DIR}/wkbuiltins.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generator.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_model.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_templates.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_combined_header.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_combined_implementation.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_header.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_separate_implementation.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_wrapper_header.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_wrapper_implementation.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_internals_wrapper_header.py
- ${_javascript_Core_SCRIPTS_DIR}/builtins_generate_internals_wrapper_implementation.py
- ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
- ${_javascript_Core_SCRIPTS_DIR}/lazywriter.py
-)
-
-set(_javascript_Core_BUILTINS_SOURCES
- ${_javascript_CORE_DIR}/builtins/AsyncFromSyncIteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/ArrayConstructor.js
- ${_javascript_CORE_DIR}/builtins/ArrayIteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/ArrayPrototype.js
- ${_javascript_CORE_DIR}/builtins/AsyncFunctionPrototype.js
- ${_javascript_CORE_DIR}/builtins/AsyncIteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/AsyncGeneratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/DatePrototype.js
- ${_javascript_CORE_DIR}/builtins/FunctionPrototype.js
- ${_javascript_CORE_DIR}/builtins/GeneratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/GlobalObject.js
- ${_javascript_CORE_DIR}/builtins/GlobalOperations.js
- ${_javascript_CORE_DIR}/builtins/InternalPromiseConstructor.js
- ${_javascript_CORE_DIR}/builtins/IteratorHelpers.js
- ${_javascript_CORE_DIR}/builtins/IteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/MapIteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/MapPrototype.js
- ${_javascript_CORE_DIR}/builtins/ModuleLoader.js
- ${_javascript_CORE_DIR}/builtins/NumberConstructor.js
- ${_javascript_CORE_DIR}/builtins/ObjectConstructor.js
- ${_javascript_CORE_DIR}/builtins/PromiseConstructor.js
- ${_javascript_CORE_DIR}/builtins/PromiseOperations.js
- ${_javascript_CORE_DIR}/builtins/PromisePrototype.js
- ${_javascript_CORE_DIR}/builtins/ReflectObject.js
- ${_javascript_CORE_DIR}/builtins/RegExpPrototype.js
- ${_javascript_CORE_DIR}/builtins/RegExpStringIteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/SetIteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/SetPrototype.js
- ${_javascript_CORE_DIR}/builtins/StringConstructor.js
- ${_javascript_CORE_DIR}/builtins/StringIteratorPrototype.js
- ${_javascript_CORE_DIR}/builtins/StringPrototype.js
- ${_javascript_CORE_DIR}/builtins/TypedArrayConstructor.js
- ${_javascript_CORE_DIR}/builtins/TypedArrayPrototype.js
- ${_javascript_CORE_DIR}/builtins/WebAssembly.js
-)
-
-add_custom_command(
- OUTPUT ${_javascript_Core_DERIVED_SOURCES_DIR}/JSCBuiltins.cpp ${_javascript_Core_DERIVED_SOURCES_DIR}/JSCBuiltins.h
- MAIN_DEPENDENCY ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py
- DEPENDS ${_javascript_Core_BUILTINS_SOURCES} ${BUILTINS_GENERATOR_SCRIPTS}
- COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_SCRIPTS_DIR}/generate-js-builtins.py --framework _javascript_Core --output-directory ${_javascript_Core_DERIVED_SOURCES_DIR} --combined ${_javascript_Core_BUILTINS_SOURCES}
- VERBATIM)
-add_custom_target(JSCBuiltins DEPENDS "${_javascript_Core_DERIVED_SOURCES_DIR}/JSCBuiltins.h")
-
list(APPEND _javascript_Core_HEADERS
${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorBackendDispatchers.h
${_javascript_Core_DERIVED_SOURCES_DIR}/inspector/InspectorFrontendDispatchers.h
Modified: trunk/Source/_javascript_Core/ChangeLog (281646 => 281647)
--- trunk/Source/_javascript_Core/ChangeLog 2021-08-26 19:33:37 UTC (rev 281646)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-08-26 19:37:16 UTC (rev 281647)
@@ -1,3 +1,14 @@
+2021-08-26 Per Arne Vollan <[email protected]>
+
+ [AppleWin] JSC build failure
+ https://bugs.webkit.org/show_bug.cgi?id=229578
+
+ Reviewed by Don Olmstead.
+
+ Add new build dependency between LLIntOffsetsExtractor and JSCBuiltins targets.
+
+ * CMakeLists.txt:
+
2021-08-26 Yusuke Suzuki <[email protected]>
[JSC] Segfault in stress/typedarray-every.js (32bit)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
