Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reland: [v8] Stop using deprecated fields of v8::FastApiCallbackOptions #196

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Reland: [v8] Stop using deprecated fields of v8::FastApiCallbackOptions #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f611a94
Reland: [v8] Stop using deprecated fields of v8::FastApiCallbackOptions
gahaas Jun 27, 2024
ed67c5b
return correct type
gahaas Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/crypto/crypto_timing.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ bool FastTimingSafeEqual(Local<Value> receiver,
uint8_t* data_b;
if (a.length() != b.length() || !a.getStorageIfAligned(&data_a) ||
!b.getStorageIfAligned(&data_b)) {
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
View file
Open in desktop
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
16 changes: 8 additions & 8 deletions src/node_wasi.cc
View file
Open in desktop
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
Loading