Skip to content

Commit 95afc2e

Browse files
addaleaxMylesBorins
authored andcommitted
deps: V8: update headers for ABI compatibility
Remove new functionality that interferes with ABI compatibility. PR-URL: #34356 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com>
1 parent 2c9fd6e commit 95afc2e

File tree

7 files changed

+24
-22
lines changed

7 files changed

+24
-22
lines changed

deps/v8/include/v8-platform.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -519,10 +519,12 @@ class Platform {
519519
* this, std::move(job_task), kNumThreads));
520520
* }
521521
*/
522-
virtual std::unique_ptr<JobHandle> PostJob(
523-
TaskPriority priority, std::unique_ptr<JobTask> job_task) {
524-
return nullptr;
525-
}
522+
/* This is not available on Node v14.x.
523+
* virtual std::unique_ptr<JobHandle> PostJob(
524+
* TaskPriority priority, std::unique_ptr<JobTask> job_task) {
525+
* return nullptr;
526+
* }
527+
*/
526528

527529
/**
528530
* Monotonically increasing time in seconds from an arbitrary fixed point in

deps/v8/include/v8.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -4768,7 +4768,9 @@ class V8_EXPORT CompiledWasmModule {
47684768
*/
47694769
MemorySpan<const uint8_t> GetWireBytesRef();
47704770

4771-
const std::string& source_url() const { return source_url_; }
4771+
/* This is not available on Node v14.x.
4772+
* const std::string& source_url() const { return source_url_; }
4773+
*/
47724774

47734775
private:
47744776
friend class WasmModuleObject;
@@ -4778,7 +4780,6 @@ class V8_EXPORT CompiledWasmModule {
47784780
const char* source_url, size_t url_length);
47794781

47804782
const std::shared_ptr<internal::wasm::NativeModule> native_module_;
4781-
const std::string source_url_;
47824783
};
47834784

47844785
// An instance of WebAssembly.Module.

deps/v8/src/api/api.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -7168,8 +7168,7 @@ MaybeLocal<Proxy> Proxy::New(Local<Context> context, Local<Object> local_target,
71687168
CompiledWasmModule::CompiledWasmModule(
71697169
std::shared_ptr<internal::wasm::NativeModule> native_module,
71707170
const char* source_url, size_t url_length)
7171-
: native_module_(std::move(native_module)),
7172-
source_url_(source_url, url_length) {
7171+
: native_module_(std::move(native_module)) {
71737172
CHECK_NOT_NULL(native_module_);
71747173
}
71757174

@@ -7205,7 +7204,7 @@ MaybeLocal<WasmModuleObject> WasmModuleObject::FromCompiledModule(
72057204
i::Handle<i::WasmModuleObject> module_object =
72067205
i_isolate->wasm_engine()->ImportNativeModule(
72077206
i_isolate, compiled_module.native_module_,
7208-
i::VectorOf(compiled_module.source_url()));
7207+
{});
72097208
return Local<WasmModuleObject>::Cast(
72107209
Utils::ToLocal(i::Handle<i::JSObject>::cast(module_object)));
72117210
}

deps/v8/src/libplatform/default-platform.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ bool DefaultPlatform::IdleTasksEnabled(Isolate* isolate) {
200200
return idle_task_support_ == IdleTaskSupport::kEnabled;
201201
}
202202

203-
std::unique_ptr<JobHandle> DefaultPlatform::PostJob(
203+
/*std::unique_ptr<JobHandle> DefaultPlatform::PostJob(
204204
TaskPriority priority, std::unique_ptr<JobTask> job_task) {
205205
size_t num_worker_threads = 0;
206206
switch (priority) {
@@ -216,7 +216,7 @@ std::unique_ptr<JobHandle> DefaultPlatform::PostJob(
216216
}
217217
return std::make_unique<DefaultJobHandle>(std::make_shared<DefaultJobState>(
218218
this, std::move(job_task), priority, num_worker_threads));
219-
}
219+
}*/
220220

221221
double DefaultPlatform::MonotonicallyIncreasingTime() {
222222
if (time_function_for_testing_) return time_function_for_testing_();

deps/v8/src/libplatform/default-platform.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class V8_PLATFORM_EXPORT DefaultPlatform : public NON_EXPORTED_BASE(Platform) {
5858
void CallDelayedOnWorkerThread(std::unique_ptr<Task> task,
5959
double delay_in_seconds) override;
6060
bool IdleTasksEnabled(Isolate* isolate) override;
61-
std::unique_ptr<JobHandle> PostJob(
62-
TaskPriority priority, std::unique_ptr<JobTask> job_state) override;
61+
/*std::unique_ptr<JobHandle> PostJob(
62+
TaskPriority priority, std::unique_ptr<JobTask> job_state) override;*/
6363
double MonotonicallyIncreasingTime() override;
6464
double CurrentClockTimeMillis() override;
6565
v8::TracingController* GetTracingController() override;

deps/v8/test/cctest/cctest.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -704,11 +704,11 @@ class TestPlatform : public v8::Platform {
704704
old_platform_->CallDelayedOnWorkerThread(std::move(task), delay_in_seconds);
705705
}
706706

707-
std::unique_ptr<v8::JobHandle> PostJob(
708-
v8::TaskPriority priority,
709-
std::unique_ptr<v8::JobTask> job_task) override {
710-
return old_platform_->PostJob(priority, std::move(job_task));
711-
}
707+
// std::unique_ptr<v8::JobHandle> PostJob(
708+
// v8::TaskPriority priority,
709+
// std::unique_ptr<v8::JobTask> job_task) override {
710+
// return old_platform_->PostJob(priority, std::move(job_task));
711+
// }
712712

713713
double MonotonicallyIncreasingTime() override {
714714
return old_platform_->MonotonicallyIncreasingTime();

deps/v8/test/unittests/compiler-dispatcher/compiler-dispatcher-unittest.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ class MockPlatform : public v8::Platform {
140140

141141
bool IdleTasksEnabled(v8::Isolate* isolate) override { return true; }
142142

143-
std::unique_ptr<JobHandle> PostJob(
144-
TaskPriority priority, std::unique_ptr<JobTask> job_state) override {
145-
UNREACHABLE();
146-
}
143+
// std::unique_ptr<JobHandle> PostJob(
144+
// TaskPriority priority, std::unique_ptr<JobTask> job_state) override {
145+
// UNREACHABLE();
146+
// }
147147

148148
double MonotonicallyIncreasingTime() override {
149149
time_ += time_step_;

0 commit comments

Comments
 (0)