[dart2bytecode] Remove the requirement for dynamic module to have 'main'

TEST=DART_CONFIGURATION=DebugX64 out/DebugX64/dart-sdk/bin/dart pkg/dynamic_modules/test/runner/main.dart -r aot --verbose Change-Id: I8647822982b051b4846dfe4ed7e51a19ef466cf9 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/384311 Commit-Queue: Alexander Markov <[email protected]> Reviewed-by: Sigmund Cherem <[email protected]>
dart-lang · Sep 10, 2024 · ad94d96 · ad94d96
1 parent a57e604
commit ad94d96
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 30 deletions.
diff --git a/pkg/dart2bytecode/lib/dart2bytecode.dart b/pkg/dart2bytecode/lib/dart2bytecode.dart
@@ -176,6 +176,7 @@ Future<int> runCompiler(ArgResults options) async {
   final results = await compileToKernel(KernelCompilationArguments(
       source: mainUri,
       options: compilerOptions,
+      requireMain: false,
       includePlatform: false,
       environmentDefines: environmentDefines,
       enableAsserts: enableAsserts));

diff --git a/pkg/dynamic_modules/test/data/duplicate_library/modules/entry1.dart b/pkg/dynamic_modules/test/data/duplicate_library/modules/entry1.dart
@@ -6,7 +6,3 @@ import 'common.dart';
 
 @pragma('dyn-module:entry-point')
 Object? entrypoint() => const A();
-
-// TODO(sigmund): remove or reconcile. W/O a main dart2bytecode produces
-// a compile-time error.
-main() {}
diff --git a/pkg/dynamic_modules/test/data/extend_class/modules/entry1.dart b/pkg/dynamic_modules/test/data/extend_class/modules/entry1.dart
@@ -11,7 +11,3 @@ class Child extends Base {
 
 @pragma('dyn-module:entry-point')
 Object? dynamicModuleEntrypoint() => Child();
-
-// TODO(sigmund): remove or reconcile. W/O a main dart2bytecode produces
-// a compile-time error.
-main() {}
diff --git a/pkg/dynamic_modules/test/data/implement_interface/modules/entry1.dart b/pkg/dynamic_modules/test/data/implement_interface/modules/entry1.dart
@@ -14,7 +14,3 @@ class Child implements Base {
 
 @pragma('dyn-module:entry-point')
 Object? dynamicModuleEntrypoint() => Child();
-
-// TODO(sigmund): remove or reconcile. W/O a main dart2bytecode produces
-// a compile-time error.
-main() {}
diff --git a/pkg/dynamic_modules/test/data/load_twice/modules/entry1.dart b/pkg/dynamic_modules/test/data/load_twice/modules/entry1.dart
@@ -6,7 +6,3 @@ class A {}
 
 @pragma('dyn-module:entry-point')
 Object? dynamicModuleEntrypoint() => A();
-
-// TODO(sigmund): remove or reconcile. W/O a main dart2bytecode produces
-// a compile-time error.
-main() {}
diff --git a/pkg/dynamic_modules/test/data/shared_const/modules/entry1.dart b/pkg/dynamic_modules/test/data/shared_const/modules/entry1.dart
@@ -6,7 +6,3 @@ import '../main.dart';
 
 @pragma('dyn-module:entry-point')
 Object? dynamicModuleEntrypoint() => const B(1);
-
-// TODO(sigmund): remove or reconcile. W/O a main dart2bytecode produces
-// a compile-time error.
-main() {}
diff --git a/pkg/dynamic_modules/test/data/shared_const/modules/entry2.dart b/pkg/dynamic_modules/test/data/shared_const/modules/entry2.dart
@@ -6,7 +6,3 @@ import '../main.dart';
 
 @pragma('dyn-module:entry-point')
 Object? dynamicModuleEntrypoint() => const B(1);
-
-// TODO(sigmund): remove or reconcile. W/O a main dart2bytecode produces
-// a compile-time error.
-main() {}
diff --git a/pkg/dynamic_modules/test/data/update_top_level/modules/entry1.dart b/pkg/dynamic_modules/test/data/update_top_level/modules/entry1.dart
@@ -8,7 +8,3 @@ import '../shared/shared.dart';
 void dynamicModuleEntrypoint() {
   topLevel = 'updated';
 }
-
-// TODO(sigmund): remove or reconcile. W/O a main dart2bytecode produces
-// a compile-time error.
-main() {}
diff --git a/pkg/vm/lib/kernel_front_end.dart b/pkg/vm/lib/kernel_front_end.dart
@@ -29,6 +29,7 @@ import 'package:front_end/src/api_unstable/vm.dart'
         StandardFileSystem,
         Verbosity,
         getMessageUri,
+        kernelForModule,
         kernelForProgram,
         parseExperimentalArguments,
         parseExperimentalFlags,
@@ -449,6 +450,7 @@ class KernelCompilationArguments {
   final List<Uri> additionalSources;
   final Uri? nativeAssets;
   final Uri? resourcesFile;
+  final bool requireMain;
   final bool includePlatform;
   final List<String> deleteToStringPackageUris;
   final List<String> keepClassNamesImplementing;
@@ -470,6 +472,7 @@ class KernelCompilationArguments {
     this.additionalSources = const <Uri>[],
     this.nativeAssets,
     this.resourcesFile,
+    this.requireMain = true,
     this.includePlatform = false,
     this.deleteToStringPackageUris = const <String>[],
     this.keepClassNamesImplementing = const <String>[],
@@ -521,8 +524,11 @@ Future<KernelCompilationResults> compileToKernel(
     compilerResult =
         await loadKernel(options.fileSystem, resolveInputUri(fromDillFile));
   } else {
-    compilerResult = await kernelForProgram(args.source!, options,
-        additionalSources: args.additionalSources);
+    compilerResult = args.requireMain
+        ? await kernelForProgram(args.source!, options,
+            additionalSources: args.additionalSources)
+        : await kernelForModule(
+            [args.source!, ...args.additionalSources], options);
   }
   final Component? component = compilerResult?.component;