diff --git a/deps/v8/include/v8-platform.h b/deps/v8/include/v8-platform.h index 6bf5a0929f6482..bf474f26803c48 100644 --- a/deps/v8/include/v8-platform.h +++ b/deps/v8/include/v8-platform.h @@ -519,10 +519,12 @@ class Platform { * this, std::move(job_task), kNumThreads)); * } */ - virtual std::unique_ptr<JobHandle> PostJob( - TaskPriority priority, std::unique_ptr<JobTask> job_task) { - return nullptr; - } + /* This is not available on Node v14.x. + * virtual std::unique_ptr<JobHandle> PostJob( + * TaskPriority priority, std::unique_ptr<JobTask> job_task) { + * return nullptr; + * } + */ /** * Monotonically increasing time in seconds from an arbitrary fixed point in diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index dcdfbfc7ec58d1..77bb8469c9f395 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -4768,7 +4768,9 @@ class V8_EXPORT CompiledWasmModule { */ MemorySpan<const uint8_t> GetWireBytesRef(); - const std::string& source_url() const { return source_url_; } + /* This is not available on Node v14.x. + * const std::string& source_url() const { return source_url_; } + */ private: friend class WasmModuleObject; @@ -4778,7 +4780,6 @@ class V8_EXPORT CompiledWasmModule { const char* source_url, size_t url_length); const std::shared_ptr<internal::wasm::NativeModule> native_module_; - const std::string source_url_; }; // An instance of WebAssembly.Module. diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc index 7f3c4bd36246ba..43f83529d82654 100644 --- a/deps/v8/src/api/api.cc +++ b/deps/v8/src/api/api.cc @@ -7168,8 +7168,7 @@ MaybeLocal<Proxy> Proxy::New(Local<Context> context, Local<Object> local_target, CompiledWasmModule::CompiledWasmModule( std::shared_ptr<internal::wasm::NativeModule> native_module, const char* source_url, size_t url_length) - : native_module_(std::move(native_module)), - source_url_(source_url, url_length) { + : native_module_(std::move(native_module)) { CHECK_NOT_NULL(native_module_); } @@ -7205,7 +7204,7 @@ MaybeLocal<WasmModuleObject> WasmModuleObject::FromCompiledModule( i::Handle<i::WasmModuleObject> module_object = i_isolate->wasm_engine()->ImportNativeModule( i_isolate, compiled_module.native_module_, - i::VectorOf(compiled_module.source_url())); + {}); return Local<WasmModuleObject>::Cast( Utils::ToLocal(i::Handle<i::JSObject>::cast(module_object))); } diff --git a/deps/v8/src/libplatform/default-platform.cc b/deps/v8/src/libplatform/default-platform.cc index e380161eb0799e..7884cc93eaef57 100644 --- a/deps/v8/src/libplatform/default-platform.cc +++ b/deps/v8/src/libplatform/default-platform.cc @@ -200,7 +200,7 @@ bool DefaultPlatform::IdleTasksEnabled(Isolate* isolate) { return idle_task_support_ == IdleTaskSupport::kEnabled; } -std::unique_ptr<JobHandle> DefaultPlatform::PostJob( +/*std::unique_ptr<JobHandle> DefaultPlatform::PostJob( TaskPriority priority, std::unique_ptr<JobTask> job_task) { size_t num_worker_threads = 0; switch (priority) { @@ -216,7 +216,7 @@ std::unique_ptr<JobHandle> DefaultPlatform::PostJob( } return std::make_unique<DefaultJobHandle>(std::make_shared<DefaultJobState>( this, std::move(job_task), priority, num_worker_threads)); -} +}*/ double DefaultPlatform::MonotonicallyIncreasingTime() { if (time_function_for_testing_) return time_function_for_testing_(); diff --git a/deps/v8/src/libplatform/default-platform.h b/deps/v8/src/libplatform/default-platform.h index d459e32490bf91..e14d95a02417de 100644 --- a/deps/v8/src/libplatform/default-platform.h +++ b/deps/v8/src/libplatform/default-platform.h @@ -58,8 +58,8 @@ class V8_PLATFORM_EXPORT DefaultPlatform : public NON_EXPORTED_BASE(Platform) { void CallDelayedOnWorkerThread(std::unique_ptr<Task> task, double delay_in_seconds) override; bool IdleTasksEnabled(Isolate* isolate) override; - std::unique_ptr<JobHandle> PostJob( - TaskPriority priority, std::unique_ptr<JobTask> job_state) override; + /*std::unique_ptr<JobHandle> PostJob( + TaskPriority priority, std::unique_ptr<JobTask> job_state) override;*/ double MonotonicallyIncreasingTime() override; double CurrentClockTimeMillis() override; v8::TracingController* GetTracingController() override; diff --git a/deps/v8/test/cctest/cctest.h b/deps/v8/test/cctest/cctest.h index 15b0f6adf1d60a..74dd9d18225a3e 100644 --- a/deps/v8/test/cctest/cctest.h +++ b/deps/v8/test/cctest/cctest.h @@ -704,11 +704,11 @@ class TestPlatform : public v8::Platform { old_platform_->CallDelayedOnWorkerThread(std::move(task), delay_in_seconds); } - std::unique_ptr<v8::JobHandle> PostJob( - v8::TaskPriority priority, - std::unique_ptr<v8::JobTask> job_task) override { - return old_platform_->PostJob(priority, std::move(job_task)); - } + // std::unique_ptr<v8::JobHandle> PostJob( + // v8::TaskPriority priority, + // std::unique_ptr<v8::JobTask> job_task) override { + // return old_platform_->PostJob(priority, std::move(job_task)); + // } double MonotonicallyIncreasingTime() override { return old_platform_->MonotonicallyIncreasingTime(); diff --git a/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc b/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc index aab8c7b91d0546..2d1e0e02c509d9 100644 --- a/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc +++ b/deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc @@ -140,10 +140,10 @@ class MockPlatform : public v8::Platform { bool IdleTasksEnabled(v8::Isolate* isolate) override { return true; } - std::unique_ptr<JobHandle> PostJob( - TaskPriority priority, std::unique_ptr<JobTask> job_state) override { - UNREACHABLE(); - } + // std::unique_ptr<JobHandle> PostJob( + // TaskPriority priority, std::unique_ptr<JobTask> job_state) override { + // UNREACHABLE(); + // } double MonotonicallyIncreasingTime() override { time_ += time_step_;