Version 3.6.0-88.0.dev

Merge 95f5efc into dev
dart-lang · Jul 27, 2024 · ad35a60 · ad35a60
2 parents 65bb9e8 + 95f5efc
commit ad35a60
Show file tree

Hide file tree

Showing 36 changed files with 450 additions and 449 deletions.
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
@@ -14,7 +14,6 @@ import("../vm/vm_sources.gni")
 import("builtin_impl_sources.gni")
 import("builtin_sources.gni")
 import("cli_sources.gni")
-import("concurrent_impl_sources.gni")
 import("io_impl_sources.gni")
 import("io_sources.gni")
 import("native_assets_impl_sources.gni")
@@ -136,37 +135,11 @@ build_native_assets_api("native_assets_api_product") {
   ]
 }
 
-template("build_concurrent_api") {
-  extra_configs = []
-  if (defined(invoker.extra_configs)) {
-    extra_configs += invoker.extra_configs
-  }
-  source_set(target_name) {
-    configs += [ "..:dart_config" ] + extra_configs
-    deps = []
-    include_dirs = [ ".." ]
-    sources = concurrent_api_sources
-    sources += [
-      "concurrent_natives.cc",
-      "concurrent_natives.h",
-    ]
-  }
-}
-
-build_concurrent_api("concurrent_api") {
-  extra_configs = [
-    "..:dart_maybe_product_config",
-    "..:dart_os_config",
-    "..:dart_arch_config",
-  ]
+# TODO(aam): Remove once https://dart-review.googlesource.com/c/sdk/+/377541
+# rolls into flutter engine.
+source_set("concurrent_api") {
 }
-
-build_concurrent_api("concurrent_api_product") {
-  extra_configs = [
-    "..:dart_product_config",
-    "..:dart_os_config",
-    "..:dart_arch_config",
-  ]
+source_set("concurrent_api_product") {
 }
 
 static_library("crashpad") {
@@ -881,12 +854,6 @@ template("dart_executable") {
       deps += [ ":standalone_dart_io" ]
     }
 
-    if (use_product_mode) {
-      deps += [ ":concurrent_api_product" ]
-    } else {
-      deps += [ ":concurrent_api" ]
-    }
-
     configs += [ ":export_api_symbols" ]
 
     ldflags = extra_ldflags
@@ -1133,7 +1100,6 @@ executable("run_vm_tests") {
   }
 
   deps = [
-    ":concurrent_api",
     ":crashpad",
     ":dart_kernel_platform_cc",
     ":dart_snapshot_cc",

diff --git a/runtime/bin/builtin_natives.cc b/runtime/bin/builtin_natives.cc
@@ -13,7 +13,6 @@
 #include "platform/assert.h"
 
 #include "bin/builtin.h"
-#include "bin/concurrent_natives.h"
 #include "bin/dartutils.h"
 #include "bin/file.h"
 #include "bin/io_natives.h"
@@ -25,8 +24,7 @@ namespace bin {
 // Lists the native functions implementing basic functionality in
 // standalone dart, such as printing, file I/O, and platform information.
 // Advanced I/O classes like sockets and process management are implemented
-// using functions listed in io_natives.cc and synchronization primitives -
-// in concurrent_natives.cc.
+// using functions listed in io_natives.cc.
 #define BUILTIN_NATIVE_LIST(V) V(Builtin_PrintString, 1)
 
 BUILTIN_NATIVE_LIST(DECLARE_FUNCTION);
@@ -65,10 +63,6 @@ Dart_NativeFunction Builtin::NativeLookup(Dart_Handle name,
   }
   Dart_NativeFunction result =
       IONativeLookup(name, argument_count, auto_setup_scope);
-  if (result != nullptr) {
-    return result;
-  }
-  result = ConcurrentNativeLookup(name, argument_count, auto_setup_scope);
   if (result == nullptr) {
     result = Builtin_DummyNative;
   }

diff --git a/runtime/bin/concurrent.cc b/runtime/bin/concurrent.cc
diff --git a/runtime/bin/concurrent_natives.cc b/runtime/bin/concurrent_natives.cc
diff --git a/runtime/bin/concurrent_natives.h b/runtime/bin/concurrent_natives.h
diff --git a/runtime/bin/thread.h b/runtime/bin/thread.h
@@ -69,25 +69,9 @@ class Mutex {
  private:
   MutexData data_;
 
-  friend class ConditionVariable;
-
   DISALLOW_COPY_AND_ASSIGN(Mutex);
 };
 
-class ConditionVariable {
- public:
-  ConditionVariable();
-  ~ConditionVariable();
-
-  void Wait(Mutex* mutex);
-  void Notify();
-
- private:
-  ConditionVariableData data_;
-
-  DISALLOW_COPY_AND_ASSIGN(ConditionVariable);
-};
-
 class Monitor {
  public:
   enum WaitResult { kNotified, kTimedOut };

diff --git a/runtime/bin/thread_absl.cc b/runtime/bin/thread_absl.cc
@@ -150,19 +150,6 @@ void Mutex::Unlock() {
   data_.mutex()->Unlock();
 }
 
-ConditionVariable::ConditionVariable() {}
-
-ConditionVariable::~ConditionVariable() {}
-
-ABSL_NO_THREAD_SAFETY_ANALYSIS
-void ConditionVariable::Wait(Mutex* mutex) {
-  data_.cond()->Wait(mutex->data_.mutex());
-}
-
-void ConditionVariable::Notify() {
-  data_.cond()->Signal();
-}
-
 Monitor::Monitor() : data_() {}
 
 Monitor::~Monitor() {}

diff --git a/runtime/bin/thread_absl.h b/runtime/bin/thread_absl.h
@@ -30,27 +30,11 @@ class MutexData {
   absl::Mutex mutex_;
 
   friend class Mutex;
-  friend class ConditionVariable;
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(MutexData);
 };
 
-class ConditionVariableData {
- private:
-  ConditionVariableData() : cond_() {}
-  ~ConditionVariableData() {}
-
-  absl::CondVar* cond() { return &cond_; }
-
-  absl::CondVar cond_;
-
-  friend class ConditionVariable;
-
-  DISALLOW_ALLOCATION();
-  DISALLOW_COPY_AND_ASSIGN(ConditionVariableData);
-};
-
 class MonitorData {
  private:
   MonitorData() : mutex_(), cond_() {}