Fix merge

Author: victorgomes

deps/zstd/unofficial.gni

@@ -19,7 +19,7 @@ template("zstd_gn_build") {
     public_configs = [ ":zstd_config" ]
     sources = gypi_values.zstd_sources
     defines = [ "XXH_NAMESPACE=ZSTD_", "ZSTD_MULTITHREAD", "ZSTD_DISABLE_ASM" ]
-    cflags_c = [ "-Wno-unused-function" ]
+    cflags_c = [ "-Wno-unused-function", "-Wno-unreachable-code" ]
 
     if (is_posix) {
       ldflags = [ "-pthread" ]

src/env.h

@@ -142,6 +142,7 @@ class NODE_EXTERN_PRIVATE IsolateData : public MemoryRetainer {
       ArrayBufferAllocator* node_allocator = nullptr,
       const EmbedderSnapshotData* embedder_snapshot_data = nullptr,
       std::shared_ptr<PerIsolateOptions> options = nullptr);
+  ~IsolateData();
 
   SET_MEMORY_INFO_NAME(IsolateData)
   SET_SELF_SIZE(IsolateData)

src/inspector/unofficial.gni

@@ -76,7 +76,7 @@ template("inspector_gn_build") {
   }
 
   config("crdtp_config") {
-    include_dirs = [ protocol_tool_path ]
+    include_dirs = [ protocol_tool_path, "$node_simdutf_path" ]
   }
 
   static_library("crdtp") {

src/node_buffer.cc

@@ -608,7 +608,6 @@ uint32_t FastCopy(Local<Value> receiver,
 
   CopyImpl(source_obj, target_obj, target_start, source_start, to_copy);
 
-  memmove(target_data + target_start, source.data() + source_start, to_copy);
   return to_copy;
 }
 
@@ -871,7 +870,6 @@ void CompareOffset(const FunctionCallbackInfo<Value> &args) {
   args.GetReturnValue().Set(val);
 }
 
-<<<<<<< HEAD
 int32_t CompareImpl(Local<Value> a_obj, Local<Value> b_obj) {
   ArrayBufferViewContents<char> a(a_obj);
   ArrayBufferViewContents<char> b(b_obj);
@@ -906,22 +904,6 @@ int32_t FastCompare(Local<Value>,
 
 static CFunction fast_compare(CFunction::Make(FastCompare));
 
-void Compare(const FunctionCallbackInfo<Value> &args) {
-  Environment* env = Environment::GetCurrent(args);
-
-  THROW_AND_RETURN_UNLESS_BUFFER(env, args[0]);
-  THROW_AND_RETURN_UNLESS_BUFFER(env, args[1]);
-  ArrayBufferViewContents<char> a(args[0]);
-  ArrayBufferViewContents<char> b(args[1]);
-
-  size_t cmp_length = std::min(a.length(), b.length());
-
-  int val = normalizeCompareVal(cmp_length > 0 ?
-                                memcmp(a.data(), b.data(), cmp_length) : 0,
-                                a.length(), b.length());
-  args.GetReturnValue().Set(val);
-}
-
 // Computes the offset for starting an indexOf or lastIndexOf search.
 // Returns either a valid offset in [0...<length - 1>], ie inside the Buffer,
 // or -1 to signal that there is no possible match.

unofficial.gni

@@ -177,7 +177,6 @@ template("node_gn_build") {
       "deps/llhttp",
       "deps/nbytes",
       "deps/nghttp2",
-      "deps/ngtcp2",
       "deps/postject",
       "deps/uvwasi",
       "deps/zstd",