[vm] Remove dart:cli waitFor

Closes #52121

Tested: CI
CoreLibraryReviewExempt: Approved breaking change to VM specific code
Change-Id: Icc89017c5a7676c2ae07488692ad8b8b9e131a7f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/354880
Commit-Queue: Slava Egorov <[email protected]>
Reviewed-by: Martin Kustermann <[email protected]>

Author: mraleph

CHANGELOG.md

@@ -19,6 +19,10 @@
 
 ### Libraries
 
+#### `dart:cli`
+
+- **Breaking change** [#52121][]: `waitFor` is removed in 3.4.
+
 #### `dart:io`
 
 - **Breaking change** [#53863][]: `Stdout` has a new field `lineTerminator`,

runtime/bin/BUILD.gn

@@ -12,7 +12,6 @@ import("../vm/heap/heap_sources.gni")
 import("../vm/vm_sources.gni")
 import("builtin_impl_sources.gni")
 import("builtin_sources.gni")
-import("cli_impl_sources.gni")
 import("cli_sources.gni")
 import("io_impl_sources.gni")
 import("io_sources.gni")
@@ -357,7 +356,7 @@ template("build_gen_snapshot_dart_io") {
 
     defines = [ "DART_IO_SECURE_SOCKET_DISABLED" ]
 
-    sources = io_impl_sources + cli_impl_sources
+    sources = io_impl_sources
     sources += [
       "io_natives.cc",
       "io_natives.h",
@@ -476,7 +475,7 @@ template("dart_io") {
       }
     }
 
-    sources = io_impl_sources + cli_impl_sources
+    sources = io_impl_sources
     sources += [
                  "builtin_natives.cc",
                  "io_natives.cc",

runtime/bin/cli.cc

@@ -553,11 +553,7 @@ Dart_Handle DartUtils::PrepareIsolateLibrary(Dart_Handle isolate_lib) {
 }
 
 Dart_Handle DartUtils::PrepareCLILibrary(Dart_Handle cli_lib) {
-  Dart_Handle wait_for_event_handle =
-      Dart_Invoke(cli_lib, NewString("_getWaitForEvent"), 0, nullptr);
-  RETURN_IF_ERROR(wait_for_event_handle);
-  return Dart_SetField(cli_lib, NewString("_waitForEventClosure"),
-                       wait_for_event_handle);
+  return Dart_Null();
 }
 
 Dart_Handle DartUtils::SetupPackageConfig(const char* packages_config) {

runtime/bin/cli_impl_sources.gni

@@ -20,7 +20,6 @@ namespace bin {
 // Some classes, like File and Directory, list their implementations in
 // builtin_natives.cc instead.
 #define IO_NATIVE_LIST(V)                                                      \
-  V(CLI_WaitForEvent, 1)                                                       \
   V(Crypto_GetRandomBytes, 1)                                                  \
   V(Directory_Create, 2)                                                       \
   V(Directory_CreateTemp, 2)                                                   \

runtime/bin/dartutils.cc

@@ -868,7 +868,7 @@ typedef struct Dart_CodeObserver {
  * implement registration of kernel blobs for the subsequent Isolate.spawnUri
  * If no callback is provided, the registration of kernel blobs will throw
  * an error.
- * 
+ *
  * \param kernel_buffer A buffer which contains a kernel program. Callback
  *                      should copy the contents of `kernel_buffer` as
  *                      it may be freed immediately after registration.
@@ -888,7 +888,7 @@ typedef const char* (*Dart_RegisterKernelBlobCallback)(
  * unregister kernel blobs.
  * If no callback is provided, the unregistration of kernel blobs will throw
  * an error.
- * 
+ *
  * \param kernel_blob_uri URI of the kernel blob to unregister.
  */
 typedef void (*Dart_UnregisterKernelBlobCallback)(const char* kernel_blob_uri);
@@ -1679,17 +1679,6 @@ DART_EXPORT Dart_Handle Dart_GetStickyError(void);
  */
 DART_EXPORT DART_WARN_UNUSED_RESULT Dart_Handle Dart_HandleMessage(void);
 
-/**
- * Drains the microtask queue, then blocks the calling thread until the current
- * isolate receives a message, then handles all messages.
- *
- * \param timeout_millis When non-zero, the call returns after the indicated
-          number of milliseconds even if no message was received.
- * \return A valid handle if no error occurs, otherwise an error handle.
- */
-DART_EXPORT DART_WARN_UNUSED_RESULT Dart_Handle
-Dart_WaitForEvent(int64_t timeout_millis);
-
 /**
  * Handles any pending messages for the vm service for the current
  * isolate.

runtime/bin/io_natives.cc

@@ -350,7 +350,6 @@ main() {
     "Dart_TypeToNullableType",
     "Dart_TypeVoid",
     "Dart_VersionString",
-    "Dart_WaitForEvent",
     "Dart_WriteHeapSnapshot",
     "Dart_WriteProfileToTimeline",
   ];

runtime/include/dart_api.h

@@ -2109,68 +2109,6 @@ DART_EXPORT Dart_Handle Dart_HandleMessage() {
   return Api::Success();
 }
 
-DART_EXPORT Dart_Handle Dart_WaitForEvent(int64_t timeout_millis) {
-  if (!FLAG_enable_deprecated_wait_for) {
-    return Dart_NewUnhandledExceptionError(Dart_NewStringFromCString(
-        "Synchronous waiting using dart:cli waitFor "
-        "and C API Dart_WaitForEvent is deprecated and disabled by default. "
-        "This feature will be fully removed in Dart 3.4 release. "
-        "You can currently still enable it by passing "
-        "--enable_deprecated_wait_for "
-        "to the Dart VM. "
-        "See https://dartbug.com/52121."));
-  }
-
-  Thread* T = Thread::Current();
-  Isolate* I = T->isolate();
-  CHECK_API_SCOPE(T);
-  CHECK_CALLBACK_STATE(T);
-  API_TIMELINE_BEGIN_END(T);
-  TransitionNativeToVM transition(T);
-  if (I->message_notify_callback() != nullptr) {
-    return Api::NewError("waitForEventSync is not supported by this embedder");
-  }
-  Object& result =
-      Object::Handle(Z, DartLibraryCalls::EnsureScheduleImmediate());
-  if (result.IsError()) {
-    return Api::NewHandle(T, result.ptr());
-  }
-
-  // Drain the microtask queue. Propagate any errors to the entry frame.
-  result = DartLibraryCalls::DrainMicrotaskQueue();
-  if (result.IsError()) {
-    // Persist the error across unwiding scopes before propagating.
-    const Error* error;
-    {
-      NoSafepointScope no_safepoint;
-      ErrorPtr raw_error = Error::Cast(result).ptr();
-      T->UnwindScopes(T->top_exit_frame_info());
-      error = &Error::Handle(T->zone(), raw_error);
-    }
-    Exceptions::PropagateToEntry(*error);
-    UNREACHABLE();
-    return Api::NewError("Unreachable");
-  }
-
-  // Block to wait for messages and then handle them. Propagate any errors to
-  // the entry frame.
-  if (I->message_handler()->PauseAndHandleAllMessages(timeout_millis) !=
-      MessageHandler::kOK) {
-    // Persist the error across unwiding scopes before propagating.
-    const Error* error;
-    {
-      NoSafepointScope no_safepoint;
-      ErrorPtr raw_error = T->StealStickyError();
-      T->UnwindScopes(T->top_exit_frame_info());
-      error = &Error::Handle(T->zone(), raw_error);
-    }
-    Exceptions::PropagateToEntry(*error);
-    UNREACHABLE();
-    return Api::NewError("Unreachable");
-  }
-  return Api::Success();
-}
-
 DART_EXPORT bool Dart_HandleServiceMessages() {
 #if defined(PRODUCT)
   return true;

runtime/tests/vm/dart/exported_symbols_test.dart

@@ -7,7 +7,7 @@
 /// ## Deprecation notice
 ///
 /// The functionality of this library is incomplete and may be removed in a
-/// later version. See [waitFor] for details.
+/// later version.
 ///
 /// {@category VM}
 @Deprecated(
@@ -16,5 +16,3 @@ library dart.cli;
 
 import 'dart:async';
 import 'dart:math';
-
-part 'wait_for.dart';

runtime/vm/dart_api_impl.cc

@@ -2,9 +2,4 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
-cli_sdk_sources = [
-  "cli.dart",
-
-  # The above file needs to be first if additional parts are added to the lib.
-  "wait_for.dart",
-]
+cli_sdk_sources = [ "cli.dart" ]