Skip to content

Commit

Permalink
src: stop using deprecated fields of v8::FastApiCallbackOptions
Browse files Browse the repository at this point in the history
Two fields on the `v8::FastApiCallbackOptions` struct were deprecated
recently: `fallback` and `wasm_memory`. This PR removes uses of these
two fields in node.js.
  • Loading branch information
gahaas authored and rogerwang committed Sep 12, 2024
1 parent d39b2ce commit 07ab385
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/crypto/crypto_timing.cc
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ bool FastTimingSafeEqual(Local<Value> receiver,
uint8_t* data_b;
if (a.length() != b.length() || !a.getStorageIfAligned(&data_a) ||
!b.getStorageIfAligned(&data_b)) {
TRACK_V8_FAST_API_CALL("crypto.timingSafeEqual.error");
options.fallback = true;
Environment* env = Environment::GetCurrent(options.isolate);
THROW_ERR_CRYPTO_TIMING_SAFE_EQUAL_LENGTH(env);
return false;
}

Expand Down
3 changes: 2 additions & 1 deletion src/histogram.cc
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ void HistogramBase::FastRecord(Local<Value> receiver,
const int64_t value,
FastApiCallbackOptions& options) {
if (value < 1) {
options.fallback = true;
Environment* env = Environment::GetCurrent(options.isolate);
THROW_ERR_OUT_OF_RANGE(env, "value is out of range");
return;
}
HistogramBase* histogram;
Expand Down
3 changes: 2 additions & 1 deletion src/node_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,8 @@ static int32_t FastInternalModuleStat(
auto path = std::filesystem::path(input.data, input.data + input.length);
if (UNLIKELY(!env->permission()->is_granted(
env, permission::PermissionScope::kFileSystemRead, path.string()))) {
options.fallback = true;
THROW_IF_INSUFFICIENT_PERMISSIONS(
env, permission::PermissionScope::kFileSystemRead, path.string(), -1);
return -1;
}

Expand Down
16 changes: 8 additions & 8 deletions src/node_wasi.cc
Original file line number Diff line number Diff line change
Expand Up @@ -248,17 +248,17 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback(
WASI* wasi = reinterpret_cast<WASI*>(BaseObject::FromJSObject(receiver));
if (UNLIKELY(wasi == nullptr)) return EinvalError<R>();

if (UNLIKELY(options.wasm_memory == nullptr || wasi->memory_.IsEmpty())) {
// fallback to slow path which to throw an error about missing memory.
options.fallback = true;
v8::Isolate* isolate = receiver->GetIsolate();
if (wasi->memory_.IsEmpty()) {
THROW_ERR_WASI_NOT_STARTED(isolate);
return EinvalError<R>();
}
uint8_t* memory = nullptr;
CHECK(LIKELY(options.wasm_memory->getStorageIfAligned(&memory)));
Local<ArrayBuffer> ab = wasi->memory_.Get(isolate)->Buffer();
size_t mem_size = ab->ByteLength();
char* mem_data = static_cast<char*>(ab->Data());
CHECK_NOT_NULL(mem_data);

return F(*wasi,
{reinterpret_cast<char*>(memory), options.wasm_memory->length()},
args...);
return F(*wasi, {mem_data, mem_size}, args...);
}

namespace {
Expand Down

0 comments on commit 07ab385

Please sign in to comment.