commit 7fc712791c7028c54c8ba15bef3cb5ee5b075f9d
author David Morgan <davidmorgan@google.com> Tue Apr 23 10:13:10 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 23 10:13:10 2024 +0000
tree 2c2bf77ff88a944b191d390d382666ef64536925
parent 1774314a04025f5f789d778542c7bc0830dcd290

[CFE] Skip macro library augmentation when considering input sources.

R=johnniwinther@google.com

Change-Id: Idcd4533542c8d3b92dad6df41378c798780f1227
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/364101
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Auto-Submit: Morgan :) <davidmorgan@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>

pkg/frontend_server/lib/frontend_server.dart

diff --git a/pkg/frontend_server/lib/frontend_server.dart b/pkg/frontend_server/lib/frontend_server.dart
index 2989a53..0fa5f98 100644
--- a/pkg/frontend_server/lib/frontend_server.dart
+++ b/pkg/frontend_server/lib/frontend_server.dart
@@ -23,6 +23,8 @@
         ExpressionCompiler,
         parseModuleFormat,
         ProgramCompiler;
+import 'package:front_end/src/api_prototype/macros.dart' as macros
+    show isMacroLibraryUri;
 import 'package:front_end/src/api_unstable/ddc.dart' as ddc
     show IncrementalCompiler;
 import 'package:front_end/src/api_unstable/vm.dart';
@@ -643,7 +645,9 @@
         nativeAssetsLibrary: _nativeAssetsLibrary,
         classHierarchy: compilerResult.classHierarchy,
         coreTypes: compilerResult.coreTypes,
-        compiledSources: component.uriToSource.keys,
+        // TODO(https://dartbug.com/55246): track macro deps when available.
+        compiledSources: component.uriToSource.keys
+            .where((uri) => !macros.isMacroLibraryUri(uri)),
       );
 
       incrementalSerializer = _generator.incrementalSerializer;
@@ -695,6 +699,7 @@
           .writeln('$boundaryKey $_kernelBinaryFilename ${errors.length}');
       final String? depfile = options['depfile'];
       if (depfile != null) {
+        // TODO(https://dartbug.com/55246): track macro deps when available.
         await writeDepfile(compilerOptions.fileSystem, compiledSources,
             _kernelBinaryFilename, depfile);
       }