From ee07e222e5fc11049065318a42b25b443568d508 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 1 Nov 2023 15:36:36 -0400 Subject: [PATCH] src,tools: initialize cppgc https://github.com/nodejs/node/pull/45704 --- patches/node/build_add_gn_build_files.patch | 122 ++++++++++++++++---- 1 file changed, 98 insertions(+), 24 deletions(-) diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index 84375153d753a..2c09f94931a1f 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -2136,22 +2136,111 @@ index 0000000000000000000000000000000000000000..616dc0c61ed4ea1bf2fb9e4768ba2ec5 + f.write(json.dumps(out, sort_keys=True, indent=2, separators=(',', ': '))) + f.write('\n') diff --git a/tools/install.py b/tools/install.py -index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd4c536570 100755 +index 11616e1bcac5308020eb68fdb811bfb86cb14dd5..845e6ce69d93983963a7a57117ecab3bd1a05e71 100755 --- a/tools/install.py +++ b/tools/install.py -@@ -202,60 +202,74 @@ def files(action): - def headers(action): - def wanted_v8_headers(files_arg, dest): +@@ -199,105 +199,106 @@ def headers(action): v8_headers = [ + # The internal cppgc headers are depended on by the public + # ones, so they need to be included as well. +- 'deps/v8/include/cppgc/internal/api-constants.h', +- 'deps/v8/include/cppgc/internal/atomic-entry-flag.h', +- 'deps/v8/include/cppgc/internal/base-page-handle.h', +- 'deps/v8/include/cppgc/internal/caged-heap-local-data.h', +- 'deps/v8/include/cppgc/internal/caged-heap.h', +- 'deps/v8/include/cppgc/internal/compiler-specific.h', +- 'deps/v8/include/cppgc/internal/finalizer-trait.h', +- 'deps/v8/include/cppgc/internal/gc-info.h', +- 'deps/v8/include/cppgc/internal/logging.h', +- 'deps/v8/include/cppgc/internal/member-storage.h', +- 'deps/v8/include/cppgc/internal/name-trait.h', +- 'deps/v8/include/cppgc/internal/persistent-node.h', +- 'deps/v8/include/cppgc/internal/pointer-policies.h', +- 'deps/v8/include/cppgc/internal/write-barrier.h', ++ '../../v8/include/cppgc/internal/api-constants.h', ++ '../../v8/include/cppgc/internal/atomic-entry-flag.h', ++ '../../v8/include/cppgc/internal/base-page-handle.h', ++ '../../v8/include/cppgc/internal/caged-heap-local-data.h', ++ '../../v8/include/cppgc/internal/caged-heap.h', ++ '../../v8/include/cppgc/internal/compiler-specific.h', ++ '../../v8/include/cppgc/internal/finalizer-trait.h', ++ '../../v8/include/cppgc/internal/gc-info.h', ++ '../../v8/include/cppgc/internal/logging.h', ++ '../../v8/include/cppgc/internal/member-storage.h', ++ '../../v8/include/cppgc/internal/name-trait.h', ++ '../../v8/include/cppgc/internal/persistent-node.h', ++ '../../v8/include/cppgc/internal/pointer-policies.h', ++ '../../v8/include/cppgc/internal/write-barrier.h', + # cppgc headers +- 'deps/v8/include/cppgc/allocation.h', - 'deps/v8/include/cppgc/common.h', -- 'deps/v8/include/libplatform/libplatform.h', +- 'deps/v8/include/cppgc/cross-thread-persistent.h', +- 'deps/v8/include/cppgc/custom-space.h', +- 'deps/v8/include/cppgc/default-platform.h', +- 'deps/v8/include/cppgc/ephemeron-pair.h', +- 'deps/v8/include/cppgc/explicit-management.h', +- 'deps/v8/include/cppgc/garbage-collected.h', +- 'deps/v8/include/cppgc/heap-consistency.h', +- 'deps/v8/include/cppgc/heap-handle.h', +- 'deps/v8/include/cppgc/heap-state.h', +- 'deps/v8/include/cppgc/heap-statistics.h', +- 'deps/v8/include/cppgc/heap.h', +- 'deps/v8/include/cppgc/liveness-broker.h', +- 'deps/v8/include/cppgc/macros.h', +- 'deps/v8/include/cppgc/member.h', +- 'deps/v8/include/cppgc/name-provider.h', +- 'deps/v8/include/cppgc/object-size-trait.h', +- 'deps/v8/include/cppgc/persistent.h', +- 'deps/v8/include/cppgc/platform.h', +- 'deps/v8/include/cppgc/prefinalizer.h', +- 'deps/v8/include/cppgc/process-heap-statistics.h', +- 'deps/v8/include/cppgc/sentinel-pointer.h', +- 'deps/v8/include/cppgc/source-location.h', +- 'deps/v8/include/cppgc/testing.h', +- 'deps/v8/include/cppgc/trace-trait.h', +- 'deps/v8/include/cppgc/type-traits.h', +- 'deps/v8/include/cppgc/visitor.h', ++ '../../v8/include/cppgc/allocation.h', ++ '../../v8/include/cppgc/common.h', ++ '../../v8/include/cppgc/cross-thread-persistent.h', ++ '../../v8/include/cppgc/custom-space.h', ++ '../../v8/include/cppgc/default-platform.h', ++ '../../v8/include/cppgc/ephemeron-pair.h', ++ '../../v8/include/cppgc/explicit-management.h', ++ '../../v8/include/cppgc/garbage-collected.h', ++ '../../v8/include/cppgc/heap-consistency.h', ++ '../../v8/include/cppgc/heap-handle.h', ++ '../../v8/include/cppgc/heap-state.h', ++ '../../v8/include/cppgc/heap-statistics.h', ++ '../../v8/include/cppgc/heap.h', ++ '../../v8/include/cppgc/liveness-broker.h', ++ '../../v8/include/cppgc/macros.h', ++ '../../v8/include/cppgc/member.h', ++ '../../v8/include/cppgc/name-provider.h', ++ '../../v8/include/cppgc/object-size-trait.h', ++ '../../v8/include/cppgc/persistent.h', ++ '../../v8/include/cppgc/platform.h', ++ '../../v8/include/cppgc/prefinalizer.h', ++ '../../v8/include/cppgc/process-heap-statistics.h', ++ '../../v8/include/cppgc/sentinel-pointer.h', ++ '../../v8/include/cppgc/source-location.h', ++ '../../v8/include/cppgc/testing.h', ++ '../../v8/include/cppgc/trace-trait.h', ++ '../../v8/include/cppgc/type-traits.h', ++ '../../v8/include/cppgc/visitor.h', + # libplatform headers - 'deps/v8/include/libplatform/libplatform-export.h', +- 'deps/v8/include/libplatform/libplatform.h', - 'deps/v8/include/libplatform/v8-tracing.h', -- 'deps/v8/include/v8.h', ++ '../../v8/include/libplatform/libplatform-export.h', ++ '../../v8/include/libplatform/libplatform.h', ++ '../../v8/include/libplatform/v8-tracing.h', + # v8 headers - 'deps/v8/include/v8-array-buffer.h', - 'deps/v8/include/v8-callbacks.h', - 'deps/v8/include/v8-container.h', - 'deps/v8/include/v8-context.h', +- 'deps/v8/include/v8-cppgc.h', - 'deps/v8/include/v8-data.h', - 'deps/v8/include/v8-date.h', - 'deps/v8/include/v8-debug.h', @@ -2195,11 +2284,8 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd - 'deps/v8/include/v8-version.h', - 'deps/v8/include/v8-wasm.h', - 'deps/v8/include/v8-weak-callback-info.h', +- 'deps/v8/include/v8.h', - 'deps/v8/include/v8config.h', -+ '../../v8/include/cppgc/common.h', -+ '../../v8/include/libplatform/libplatform.h', -+ '../../v8/include/libplatform/libplatform-export.h', -+ '../../v8/include/libplatform/v8-tracing.h', + '../../v8/include/v8-array-buffer.h', + '../../v8/include/v8-callbacks.h', + '../../v8/include/v8-container.h', @@ -2213,14 +2299,10 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd + '../../v8/include/v8-exception.h', + '../../v8/include/v8-extension.h', + '../../v8/include/v8-external.h', -+ '../../v8/include/v8-fast-api-calls.h', + '../../v8/include/v8-forward.h', + '../../v8/include/v8-function-callback.h', + '../../v8/include/v8-function.h', -+ '../../v8/include/v8-handle-base.h', + '../../v8/include/v8-initialization.h', -+ '../../v8/include/v8-inspector-protocol.h', -+ '../../v8/include/v8-inspector.h', + '../../v8/include/v8-internal.h', + '../../v8/include/v8-isolate.h', + '../../v8/include/v8-json.h', @@ -2229,7 +2311,6 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd + '../../v8/include/v8-maybe.h', + '../../v8/include/v8-memory-span.h', + '../../v8/include/v8-message.h', -+ '../../v8/include/v8-metrics.h', + '../../v8/include/v8-microtask-queue.h', + '../../v8/include/v8-microtask.h', + '../../v8/include/v8-object.h', @@ -2243,31 +2324,24 @@ index f13f2ecd662a5fb985839b394b45319c091b56d4..21bc48324946d52ed2b1c9eec35c1fcd + '../../v8/include/v8-regexp.h', + '../../v8/include/v8-script.h', + '../../v8/include/v8-snapshot.h', -+ '../../v8/include/v8-source-location.h', + '../../v8/include/v8-statistics.h', + '../../v8/include/v8-template.h', + '../../v8/include/v8-traced-handle.h', + '../../v8/include/v8-typed-array.h', -+ '../../v8/include/v8-unwinder-state.h', + '../../v8/include/v8-unwinder.h', -+ '../../v8/include/v8-util.h', -+ '../../v8/include/v8-value-serializer-version.h', + '../../v8/include/v8-value-serializer.h', + '../../v8/include/v8-value.h', -+ '../../v8/include/v8-version-string.h', + '../../v8/include/v8-version.h', -+ '../../v8/include/v8-wasm-trap-handler-posix.h', -+ '../../v8/include/v8-wasm-trap-handler-win.h', + '../../v8/include/v8-wasm.h', + '../../v8/include/v8-weak-callback-info.h', + '../../v8/include/v8.h', -+ '../../v8/include/v8config.h' ++ '../../v8/include/v8config.h', ] + v8_headers = [h.replace('deps/', '../../') for h in v8_headers] files_arg = [name for name in files_arg if name in v8_headers] action(files_arg, dest) -@@ -282,7 +296,7 @@ def headers(action): +@@ -324,7 +325,7 @@ def headers(action): if sys.platform.startswith('aix') or sys.platform == "os400": action(['out/Release/node.exp'], 'include/node/')