Clean up

Author: Emmanuel Garcia

runtime/dart_isolate.cc

@@ -728,8 +728,9 @@ bool DartIsolate::MarkIsolateRunnable() {
 static void InvokeDartPluginRegistrantIfAvailable(Dart_Handle library_handle) {
   TRACE_EVENT0("flutter", "InvokeDartPluginRegistrantIfAvailable");
 
-  // The Dart plugin registrant is a static with signature `void register()`
-  // within the class `_PluginRegistrant` generated by the Flutter tool.
+  // The Dart plugin registrant is a static method with signature `void
+  // register()` within the class `_PluginRegistrant` generated by the Flutter
+  // tool.
   //
   // This method binds a plugin implementation to their platform
   // interface based on the configuration of the app's pubpec.yaml, and the
@@ -767,11 +768,13 @@ bool DartIsolate::RunFromLibrary(std::optional<std::string> library_name,
   auto entrypoint_handle = entrypoint.has_value() && !entrypoint.value().empty()
                                ? tonic::ToDart(entrypoint.value().c_str())
                                : tonic::ToDart("main");
-  auto entrypoint_args = tonic::ToDart(args);
+
+  InvokeDartPluginRegistrantIfAvailable(library_handle);
+
   auto user_entrypoint_function =
       ::Dart_GetField(library_handle, entrypoint_handle);
 
-  InvokeDartPluginRegistrantIfAvailable(library_handle);
+  auto entrypoint_args = tonic::ToDart(args);
 
   if (!InvokeMainEntrypoint(user_entrypoint_function, entrypoint_args)) {
     return false;