From bae24121ad3ee414c52043d2443817d4c555b1d4 Mon Sep 17 00:00:00 2001 From: Victor Gomes Date: Tue, 23 Apr 2024 10:56:28 +0200 Subject: [PATCH] Fix 2024-04-23 merge --- deps/simdjson/unofficial.gni | 2 +- src/inspector_profiler.h | 2 +- src/js_stream.cc | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deps/simdjson/unofficial.gni b/deps/simdjson/unofficial.gni index d6909b95886f4d..826e5b4a517004 100644 --- a/deps/simdjson/unofficial.gni +++ b/deps/simdjson/unofficial.gni @@ -14,7 +14,7 @@ template("simdjson_gn_build") { "scope", [ "simdjson.gyp" ]) - source_set(target_name) { + component(target_name) { forward_variables_from(invoker, "*") public_configs = [ ":simdjson_config" ] sources = gypi_values.simdjson_sources diff --git a/src/inspector_profiler.h b/src/inspector_profiler.h index fd741c1f1ff659..247cfdf03c796a 100644 --- a/src/inspector_profiler.h +++ b/src/inspector_profiler.h @@ -10,7 +10,7 @@ #include #include #include "inspector_agent.h" -#include "simdjson.h" +#include "../../deps/simdjson/simdjson.h" namespace node { // Forward declaration to break recursive dependency chain with src/env.h. diff --git a/src/js_stream.cc b/src/js_stream.cc index 1ca95dfbdec1ef..55cbdf5bf2b0a3 100644 --- a/src/js_stream.cc +++ b/src/js_stream.cc @@ -163,7 +163,6 @@ void JSStream::Finish(const FunctionCallbackInfo& args) { void JSStream::ReadBuffer(const FunctionCallbackInfo& args) { - v8::TryCatch try_catch(args.GetIsolate()); JSStream* wrap; ASSIGN_OR_RETURN_UNWRAP(&wrap, args.This());