src: modernize likely/unlikely hints

nodejs/node#55155

Author: codebytere

patches/node/build_enable_perfetto.patch

@@ -285,22 +285,8 @@ index 8f053efe93324b9acbb4e85f7b974b4f7712e200..e331ed5567caa39ade90ce28cea69f1d
  void NodeTraceWriter::FlushPrivate() {
    std::string str;
    int highest_request_id;
-diff --git a/src/tracing/node_trace_writer.h b/src/tracing/node_trace_writer.h
-index cd965d77b7859ff2edcf781a934594b5a9b6d251..fe1714ba77fddef693d37eeb8c7a196ddfd15c26 100644
---- a/src/tracing/node_trace_writer.h
-+++ b/src/tracing/node_trace_writer.h
-@@ -20,7 +20,9 @@ class NodeTraceWriter : public AsyncTraceWriter {
-   ~NodeTraceWriter() override;
- 
-   void InitializeOnThread(uv_loop_t* loop) override;
-+#ifndef V8_USE_PERFETTO
-   void AppendTraceEvent(TraceObject* trace_event) override;
-+#endif
-   void Flush(bool blocking) override;
- 
-   static const int kTracesPerFile = 1 << 19;
 diff --git a/src/tracing/trace_event.h b/src/tracing/trace_event.h
-index be0f55a409a71bf9c1763c36fdc252857228742e..827b5330b2f8c545338a46c548f8abf4aab7f50c 100644
+index a662a081dc3bf356bf93e4063fcb043e4d8df07b..c89cdfe2b2681fbf9946200a03d7d1f7bad21226 100644
 --- a/src/tracing/trace_event.h
 +++ b/src/tracing/trace_event.h
 @@ -69,8 +69,16 @@ enum CategoryGroupEnabledFlags {
@@ -336,36 +322,31 @@ index be0f55a409a71bf9c1763c36fdc252857228742e..827b5330b2f8c545338a46c548f8abf4
 
  // Adds a metadata event to the trace log. The |AppendValueAsTraceFormat| method
  // on the convertable value will be called at flush time.
-@@ -319,10 +332,13 @@ class TraceEventHelper {
+@@ -319,12 +332,15 @@ class TraceEventHelper {
    static void SetAgent(Agent* agent);
 
    static inline const uint8_t* GetCategoryGroupEnabled(const char* group) {
 +#ifndef V8_USE_PERFETTO
      v8::TracingController* controller = GetTracingController();
      static const uint8_t disabled = 0;
-     if (UNLIKELY(controller == nullptr)) return &disabled;
+     if (controller == nullptr) [[unlikely]] {
+       return &disabled;
+     }
      return controller->GetCategoryGroupEnabled(group);
 +#endif
 +    return 0;
    }
  };
 
-@@ -460,6 +476,7 @@ static inline uint64_t AddTraceEventImpl(
+@@ -462,6 +478,7 @@ static inline uint64_t AddTraceEventImpl(
      const char* scope, uint64_t id, uint64_t bind_id, int32_t num_args,
      const char** arg_names, const uint8_t* arg_types,
      const uint64_t* arg_values, unsigned int flags) {
 +#ifndef V8_USE_PERFETTO
    std::unique_ptr<v8::ConvertableToTraceFormat> arg_convertibles[2];
    if (num_args > 0 && arg_types[0] == TRACE_VALUE_TYPE_CONVERTABLE) {
      arg_convertibles[0].reset(reinterpret_cast<v8::ConvertableToTraceFormat*>(
-@@ -469,13 +486,14 @@ static inline uint64_t AddTraceEventImpl(
-     arg_convertibles[1].reset(reinterpret_cast<v8::ConvertableToTraceFormat*>(
-         static_cast<intptr_t>(arg_values[1])));
-   }
--  // DCHECK(num_args, 2);
-   v8::TracingController* controller =
-       node::tracing::TraceEventHelper::GetTracingController();
-   if (controller == nullptr) return 0;
+@@ -478,6 +495,8 @@ static inline uint64_t AddTraceEventImpl(
    return controller->AddTraceEvent(phase, category_group_enabled, name, scope, id,
                                     bind_id, num_args, arg_names, arg_types,
                                     arg_values, arg_convertibles, flags);
@@ -374,25 +355,18 @@ index be0f55a409a71bf9c1763c36fdc252857228742e..827b5330b2f8c545338a46c548f8abf4
  }
 
  static V8_INLINE uint64_t AddTraceEventWithTimestampImpl(
-@@ -483,6 +501,7 @@ static V8_INLINE uint64_t AddTraceEventWithTimestampImpl(
+@@ -485,6 +504,7 @@ static V8_INLINE uint64_t AddTraceEventWithTimestampImpl(
      const char* scope, uint64_t id, uint64_t bind_id, int32_t num_args,
      const char** arg_names, const uint8_t* arg_types,
      const uint64_t* arg_values, unsigned int flags, int64_t timestamp) {
 +#ifndef V8_USE_PERFETTO
-   std::unique_ptr<v8::ConvertableToTraceFormat> arg_convertables[2];
+   std::unique_ptr<v8::ConvertableToTraceFormat> arg_convertibles[2];
    if (num_args > 0 && arg_types[0] == TRACE_VALUE_TYPE_CONVERTABLE) {
-     arg_convertables[0].reset(reinterpret_cast<v8::ConvertableToTraceFormat*>(
-@@ -492,19 +511,21 @@ static V8_INLINE uint64_t AddTraceEventWithTimestampImpl(
-     arg_convertables[1].reset(reinterpret_cast<v8::ConvertableToTraceFormat*>(
-         static_cast<intptr_t>(arg_values[1])));
-   }
--  // DCHECK_LE(num_args, 2);
-   v8::TracingController* controller =
-       node::tracing::TraceEventHelper::GetTracingController();
-   if (controller == nullptr) return 0;
+     arg_convertibles[0].reset(reinterpret_cast<v8::ConvertableToTraceFormat*>(
+@@ -501,12 +521,15 @@ static V8_INLINE uint64_t AddTraceEventWithTimestampImpl(
    return controller->AddTraceEventWithTimestamp(
        phase, category_group_enabled, name, scope, id, bind_id, num_args,
-       arg_names, arg_types, arg_values, arg_convertables, flags, timestamp);
+       arg_names, arg_types, arg_values, arg_convertibles, flags, timestamp);
 +#endif
 +  return 0;
  }
@@ -405,11 +379,12 @@ index be0f55a409a71bf9c1763c36fdc252857228742e..827b5330b2f8c545338a46c548f8abf4
    std::unique_ptr<v8::ConvertableToTraceFormat> arg_convertibles[2];
    if (num_args > 0 && arg_types[0] == TRACE_VALUE_TYPE_CONVERTABLE) {
      arg_convertibles[0].reset(reinterpret_cast<v8::ConvertableToTraceFormat*>(
-@@ -520,6 +541,7 @@ static V8_INLINE void AddMetadataEventImpl(
+@@ -522,6 +545,7 @@ static V8_INLINE void AddMetadataEventImpl(
    return agent->GetTracingController()->AddMetadataEvent(
        category_group_enabled, name, num_args, arg_names, arg_types, arg_values,
        arg_convertibles, flags);
 +#endif
  }
 
  // Define SetTraceValue for each allowed type. It stores the type and
+

patches/node/src_stop_using_deprecated_fields_of_fastapicallbackoptions.patch

@@ -40,14 +40,13 @@ index 4dbdea9be5721486d71a9dda77311b4919d450a3..4aacaa2a5d12533a039b4b96cb7f1fd7
    }
    HistogramBase* histogram;
 diff --git a/src/node_file.cc b/src/node_file.cc
-index b565beae625d970ba92ab667a145d8897d4e8a6e..31c2fe82299d6905855c4efffeea4a4d161a88d5 100644
+index 6b98a13099990918dc619c47124c8538bbee5e2d..307492bf3dfce7b4a476c448bec666b8116dc431 100644
 --- a/src/node_file.cc
 +++ b/src/node_file.cc
-@@ -1049,23 +1049,10 @@ static int32_t FastInternalModuleStat(
-     const FastOneByteString& input,
+@@ -1060,22 +1060,10 @@ static int32_t FastInternalModuleStat(
      // NOLINTNEXTLINE(runtime/references) This is V8 api.
      FastApiCallbackOptions& options) {
--  // This needs a HandleScope which needs an isolate.
+   // This needs a HandleScope which needs an isolate.
 -  Isolate* isolate = Isolate::TryGetCurrent();
 -  if (!isolate) {
 -    options.fallback = true;
@@ -60,34 +59,39 @@ index b565beae625d970ba92ab667a145d8897d4e8a6e..31c2fe82299d6905855c4efffeea4a4d
 +  HandleScope scope(env->isolate());
 
    auto path = std::filesystem::path(input.data, input.data + input.length);
--  if (UNLIKELY(!env->permission()->is_granted(
--          env, permission::PermissionScope::kFileSystemRead, path.string()))) {
+-  if (!env->permission()->is_granted(
+-          env, permission::PermissionScope::kFileSystemRead, path.string()))
+-      [[unlikely]] {
 -    options.fallback = true;
 -    return -1;
 -  }
--
+ 
    switch (std::filesystem::status(path).type()) {
      case std::filesystem::file_type::directory:
-       return 1;
 diff --git a/src/node_wasi.cc b/src/node_wasi.cc
-index ad1da44a01f437c97e06a3857eebd2edcebc83da..7123278e1a0942b61a76e9b1e7464eb8b5064079 100644
+index 468c2e59903fefe58d9c178d3afac3ef5b09f611..9788b8fa4dd949c3625548179546f645bc9493c5 100644
 --- a/src/node_wasi.cc
 +++ b/src/node_wasi.cc
-@@ -248,17 +248,18 @@ 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;
+@@ -246,22 +246,19 @@ R WASI::WasiFunction<FT, F, R, Args...>::FastCallback(
+     Args... args,
+     // NOLINTNEXTLINE(runtime/references) This is V8 api.
+     FastApiCallbackOptions& options) {
+-  WASI* wasi = reinterpret_cast<WASI*>(BaseObject::FromJSObject(receiver));
+-  if (wasi == nullptr) [[unlikely]] {
 +  v8::Isolate* isolate = receiver->GetIsolate();
 +  v8::HandleScope handle_scope(isolate);
 +  if (wasi->memory_.IsEmpty()) {
 +    THROW_ERR_WASI_NOT_STARTED(isolate);
      return EinvalError<R>();
    }
+ 
+-  if (options.wasm_memory == nullptr || wasi->memory_.IsEmpty()) [[unlikely]] {
+-    // fallback to slow path which to throw an error about missing memory.
+-    options.fallback = true;
+-    return EinvalError<R>();
+-  }
 -  uint8_t* memory = nullptr;
--  CHECK(LIKELY(options.wasm_memory->getStorageIfAligned(&memory)));
+-  CHECK(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());