[cfe] Remove macro support

This removes the support running macros in the CFE.

The scanner and package:kernel still have support for the macro modifier. This will be removed in a follow-up.

The metadata expression parser is deliberately left in, since it might serve as the basis for a parser AST.

Change-Id: I06d91eb0fac2e7a71e6afde647b03be3814dbd5f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406963
Commit-Queue: Johnni Winther <[email protected]>
Reviewed-by: Morgan :) <[email protected]>

Author: johnniwinther

pkg/_fe_analyzer_shared/test/metadata/data/marker.options

@@ -1,3 +1 @@
 cfe=pkg/front_end/test/id_tests/metadata_test.dart
-analyzer=pkg/analyzer/test/id_tests/metadata_test.dart
-

pkg/_fe_analyzer_shared/test/metadata/evaluate_data/marker.options

@@ -1,3 +1,2 @@
 cfe=pkg/front_end/test/id_tests/metadata_evaluate_test.dart
-analyzer=pkg/analyzer/test/id_tests/metadata_evaluate_test.dart
 

pkg/dev_compiler/lib/src/command/command.dart

@@ -295,9 +295,7 @@ Future<CompilerResult> _compile(List<String> args,
         explicitExperimentalFlags: explicitExperimentalFlags,
         environmentDefines: declaredVariables,
         nnbdMode:
-            options.soundNullSafety ? fe.NnbdMode.Strong : fe.NnbdMode.Weak,
-        precompiledMacros: options.precompiledMacros,
-        macroSerializationMode: options.macroSerializationMode);
+            options.soundNullSafety ? fe.NnbdMode.Strong : fe.NnbdMode.Weak);
     result = await fe.compile(compilerState, inputs, diagnosticMessageHandler);
   } else {
     // If digests weren't given and if not in worker mode, create fake data and

pkg/front_end/lib/src/api_prototype/compiler_options.dart

@@ -11,13 +11,9 @@ import 'package:kernel/ast.dart' show Component, Version;
 import 'package:kernel/default_language_version.dart' as kernel
     show defaultLanguageVersion;
 import 'package:kernel/target/targets.dart' show Target;
-import 'package:macros/src/executor/multi_executor.dart';
-import 'package:macros/src/executor/serialization.dart' as macros
-    show SerializationMode;
 
 import '../api_unstable/util.dart';
 import '../base/nnbd_mode.dart';
-import '../macros/macro_serializer.dart';
 import 'experimental_flags.dart'
     show
         AllowedExperimentalFlags,
@@ -110,42 +106,6 @@ class CompilerOptions {
   /// file system.  TODO(paulberry): fix this.
   FileSystem fileSystem = StandardFileSystem.instance;
 
-  /// The [MultiMacroExecutor] for loading and executing macros if supported.
-  ///
-  /// This is part of the experimental macro feature.
-  MultiMacroExecutor? macroExecutor;
-
-  /// If true, all macro applications must have a corresponding prebuilt macro
-  /// supplied via `precompiledMacros`.
-  ///
-  /// Otherwise, that's an error.
-  ///
-  /// This is part of the experimental macro feature.
-  bool requirePrebuiltMacros = false;
-
-  /// Function that can create a [Uri] for the serialized result of a
-  /// [Component].
-  ///
-  /// This is used to turn a precompiled macro into a [Uri] that can be loaded
-  /// by the [macroExecutor].
-  ///
-  /// If `null` then an appropriate macro serializer will be created.
-  ///
-  /// [MacroSerializer.close] will be called when `Uri`s created are no longer
-  /// needed.
-  ///
-  /// This is part of the experimental macro feature.
-  MacroSerializer? macroSerializer;
-
-  /// Raw precompiled macro options, each of the format
-  /// `<program-uri>;<macro-library-uri>`.
-  ///
-  /// Multiple library URIs may be provided separated by additional semicolons.
-  List<String>? precompiledMacros;
-
-  /// The serialization mode to use for macro communication.
-  macros.SerializationMode? macroSerializationMode;
-
   /// Whether to generate code for the SDK.
   ///
   /// By default the front end resolves components using a prebuilt SDK summary.
@@ -257,9 +217,6 @@ class CompilerOptions {
   /// order to ensure a stable output for testing.
   bool omitOsMessageForTesting = false;
 
-  /// If `true`, macro generated libraries will be printed during compilation.
-  bool showGeneratedMacroSourcesForTesting = false;
-
   /// Object used for hooking into the compilation pipeline during testing.
   HooksForTesting? hooksForTesting;
 
@@ -299,16 +256,6 @@ class CompilerOptions {
       experimentReleasedVersionForTesting: experimentReleasedVersionForTesting,
       allowedExperimentalFlags: allowedExperimentalFlagsForTesting);
 
-  /// The precompilations already in progress in an outer compile or that will
-  /// be built in the current compile.
-  ///
-  /// When a compile discovers macros that are not prebuilt it launches a new
-  /// nested compile to build them, a precompilation. That precompilation must
-  /// itself launch more compilations if it encounters more macros. This set
-  /// tracks what is running so that already-running precompilations are not
-  /// launched again.
-  Set<Uri> runningPrecompilations = {};
-
   // Coverage-ignore(suite): Not run.
   /// Returns the minimum language version needed for a library with the given
   /// [importUri] to opt into the experiment with the given [flag].
@@ -667,22 +614,6 @@ class Verbosity {
 // Coverage-ignore(suite): Not run.
 /// Interface for hooking into the compilation pipeline for testing.
 class HooksForTesting {
-  /// Called before the intermediate macro augmentation libraries have been
-  /// replaced by the merged macro augmentation libraries.
-  ///
-  /// [Component] is the fully built component at this stage of the compilation.
-  ///
-  /// If macros are not applied, this is not called.
-  void beforeMergingMacroAugmentations(Component component) {}
-
-  /// Called after the intermediate macro augmentation libraries have been
-  /// replaced by the merged macro augmentation libraries.
-  ///
-  /// [Component] is the fully built component at this stage of the compilation.
-  ///
-  /// If macros are not applied, this is not called.
-  void afterMergingMacroAugmentations(Component component) {}
-
   /// Called at the end of full compilation in the `KernelTarget.buildComponent`
   /// method.
   ///

pkg/front_end/lib/src/api_unstable/bazel_worker.dart

@@ -83,28 +83,21 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
       trackNeededDillLibraries: trackNeededDillLibraries,
       environmentDefines: environmentDefines,
       verbose: verbose,
-      nnbdMode: nnbdMode,
-      requirePrebuiltMacros: requirePrebuiltMacros,
-      precompiledMacros: precompiledMacros,
-      macroSerializationMode: macroSerializationMode);
+      nnbdMode: nnbdMode);
 }
 
 InitializedCompilerState initializeCompiler(
-  InitializedCompilerState? oldState,
-  Uri? sdkSummary,
-  Uri? librariesSpecificationUri,
-  Uri? packagesFile,
-  List<Uri> additionalDills,
-  Target target,
-  FileSystem fileSystem,
-  Iterable<String> experiments,
-  Map<String, String>? environmentDefines, {
-  bool verbose = false,
-  NnbdMode nnbdMode = NnbdMode.Strong,
-  bool requirePrebuiltMacros = false,
-  List<String> precompiledMacros = const [],
-  SerializationMode macroSerializationMode = SerializationMode.byteData,
-}) {
+    InitializedCompilerState? oldState,
+    Uri? sdkSummary,
+    Uri? librariesSpecificationUri,
+    Uri? packagesFile,
+    List<Uri> additionalDills,
+    Target target,
+    FileSystem fileSystem,
+    Iterable<String> experiments,
+    Map<String, String>? environmentDefines,
+    {bool verbose = false,
+    NnbdMode nnbdMode = NnbdMode.Strong}) {
   // TODO(sigmund): use incremental compiler when it supports our use case.
   // Note: it is common for the summary worker to invoke the compiler with the
   // same input summary URIs, but with different contents, so we'd need to be
@@ -122,10 +115,7 @@ InitializedCompilerState initializeCompiler(
         parseExperimentalArguments(experiments),
         onError: (e) => throw e)
     ..verbose = verbose
-    ..nnbdMode = nnbdMode
-    ..requirePrebuiltMacros = requirePrebuiltMacros
-    ..precompiledMacros = precompiledMacros
-    ..macroSerializationMode = macroSerializationMode;
+    ..nnbdMode = nnbdMode;
 
   ProcessedOptions processedOpts = new ProcessedOptions(options: options);
 

pkg/front_end/lib/src/api_unstable/ddc.dart

@@ -7,7 +7,6 @@ import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart'
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/kernel.dart' show Component, Library;
 import 'package:kernel/target/targets.dart' show Target;
-import 'package:macros/src/executor/serialization.dart' show SerializationMode;
 
 import '../api_prototype/compiler_options.dart' show CompilerOptions;
 import '../api_prototype/experimental_flags.dart' show ExperimentalFlag;
@@ -105,10 +104,7 @@ InitializedCompilerState initializeCompiler(
     {FileSystem? fileSystem,
     Map<ExperimentalFlag, bool>? explicitExperimentalFlags,
     Map<String, String>? environmentDefines,
-    required NnbdMode nnbdMode,
-    bool requirePrebuiltMacros = false,
-    List<String>? precompiledMacros,
-    String? macroSerializationMode}) {
+    required NnbdMode nnbdMode}) {
   additionalDills.sort((a, b) => a.toString().compareTo(b.toString()));
 
   if (oldState != null &&
@@ -120,9 +116,7 @@ InitializedCompilerState initializeCompiler(
       equalLists(oldState.options.additionalDills, additionalDills) &&
       equalMaps(oldState.options.explicitExperimentalFlags,
           explicitExperimentalFlags) &&
-      equalMaps(oldState.options.environmentDefines, environmentDefines) &&
-      equalLists(oldState.options.precompiledMacros, precompiledMacros) &&
-      oldState.options.requirePrebuiltMacros == requirePrebuiltMacros) {
+      equalMaps(oldState.options.environmentDefines, environmentDefines)) {
     // Reuse old state.
     return oldState;
   }
@@ -137,11 +131,7 @@ InitializedCompilerState initializeCompiler(
     ..target = target
     ..fileSystem = fileSystem ?? StandardFileSystem.instance
     ..environmentDefines = environmentDefines
-    ..nnbdMode = nnbdMode
-    ..precompiledMacros = precompiledMacros
-    ..macroSerializationMode = macroSerializationMode == null
-        ? null
-        : new SerializationMode.fromOption(macroSerializationMode);
+    ..nnbdMode = nnbdMode;
   if (explicitExperimentalFlags != null) {
     options.explicitExperimentalFlags = explicitExperimentalFlags;
   }
@@ -191,8 +181,6 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
       environmentDefines: environmentDefines,
       outlineOnly: false,
       omitPlatform: false,
-      requirePrebuiltMacros: requirePrebuiltMacros,
-      precompiledMacros: precompiledMacros,
       trackNeededDillLibraries: trackNeededDillLibraries,
       nnbdMode: nnbdMode);
 }

pkg/front_end/lib/src/api_unstable/modular_incremental_compilation.dart

@@ -6,7 +6,6 @@ import 'dart:typed_data';
 
 import 'package:kernel/kernel.dart' show Component, CanonicalName, Library;
 import 'package:kernel/target/targets.dart' show Target;
-import 'package:macros/src/executor/serialization.dart' show SerializationMode;
 
 import '../api_prototype/compiler_options.dart' show CompilerOptions;
 import '../api_prototype/experimental_flags.dart' show ExperimentalFlag;
@@ -17,7 +16,7 @@ import '../base/nnbd_mode.dart' show NnbdMode;
 import '../base/processed_options.dart' show ProcessedOptions;
 import 'compiler_state.dart'
     show InitializedCompilerState, WorkerInputComponent, digestsEqual;
-import 'util.dart' show equalLists, equalMaps, equalSets;
+import 'util.dart' show equalMaps, equalSets;
 
 /// Initializes the compiler for a modular build.
 ///
@@ -49,11 +48,7 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
     bool omitPlatform = false,
     bool trackNeededDillLibraries = false,
     bool verbose = false,
-    NnbdMode nnbdMode = NnbdMode.Strong,
-    bool requirePrebuiltMacros = false,
-    List<String> precompiledMacros = const [],
-    SerializationMode macroSerializationMode =
-        SerializationMode.byteData}) async {
+    NnbdMode nnbdMode = NnbdMode.Strong}) async {
   bool isRetry = false;
   while (true) {
     try {
@@ -86,18 +81,13 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
           !equalSets(oldState.tags, tags) ||
           (sdkSummary != null &&
               (cachedSdkInput == null ||
-                  !digestsEqual(cachedSdkInput.digest, sdkDigest))) ||
-          // TODO(davidmorgan): add correct change detection for macros.
-          oldState.options.requirePrebuiltMacros != requirePrebuiltMacros ||
-          !equalLists(oldState.options.precompiledMacros, precompiledMacros) ||
-          oldState.options.macroSerializationMode != macroSerializationMode) {
+                  !digestsEqual(cachedSdkInput.digest, sdkDigest)))) {
         // No - or immediately not correct - previous state.
         // We'll load a new sdk, anything loaded already will have a wrong root.
         workerInputCache.clear();
         workerInputCacheLibs.clear();
 
         // The sdk was either not cached or it has changed.
-        await oldState?.processedOpts.dispose();
         options = new CompilerOptions()
           ..compileSdk = compileSdk
           ..sdkRoot = sdkRoot
@@ -110,10 +100,7 @@ Future<InitializedCompilerState> initializeIncrementalCompiler(
           ..environmentDefines = environmentDefines
           ..explicitExperimentalFlags = explicitExperimentalFlags
           ..verbose = verbose
-          ..nnbdMode = nnbdMode
-          ..requirePrebuiltMacros = requirePrebuiltMacros
-          ..precompiledMacros = precompiledMacros
-          ..macroSerializationMode = macroSerializationMode;
+          ..nnbdMode = nnbdMode;
 
         processedOpts = new ProcessedOptions(options: options);
         if (sdkSummary != null && sdkDigest != null) {

pkg/front_end/lib/src/base/command_line_options.dart

@@ -35,8 +35,6 @@ class Flags {
   static const String omitPlatform = "--omit-platform";
   static const String fatal = "--fatal";
   static const String fatalSkip = "--fatal-skip";
-  static const String showGeneratedMacroSources = "--show-macros";
-  static const String checkMacroOffsets = "--check-macro-offsets";
   static const String help = "--help";
   static const String librariesJson = "--libraries-json";
   static const String noDefines = "--no-defines";
@@ -76,10 +74,6 @@ class Options {
       const Option(Flags.fatal, const StringListValue());
   static const Option<String?> fatalSkip =
       const Option(Flags.fatalSkip, const StringValue());
-  static const Option<bool> showGeneratedMacroSources =
-      const Option(Flags.showGeneratedMacroSources, const BoolValue(false));
-  static const Option<bool> checkMacroOffsets =
-      const Option(Flags.checkMacroOffsets, const BoolValue(false));
   static const Option<int?> forceLateLowering = const Option(
       Flags.forceLateLowering,
       const IntValue(defaultValue: null, noArgValue: LateLowering.all));