languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 21:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[frontend_server] Support @Native assets in compute_kernel

Browse source 
The utils/bazel/kernel_worker.dart entry-point uses
pkg/frontend_server/lib/compute_kernel.dart as entry-point.
So we need to cover this entry point to the frontend_server as well
to pass the native asset yaml file.

Upstreamed from cl/530924434 and cl/512913404.

Change-Id: I86204870807da4ee3e8a7b10c40a17862042da08
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/286141
Reviewed-by: Jens Johansen <jensj@google.com>
Commit-Queue: Daco Harkes <dacoharkes@google.com>
This commit is contained in:
Daco Harkes 2023-05-16 09:50:38 +00:00 committed by Commit Queue
parent ea84221100
commit 3466d6855a
1 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pkg/frontend_server/lib/compute_kernel.dart
View file

@ -24,8 +24,11 @@ import 'package:front_end/src/api_prototype/file_system.dart';
import 'package:front_end/src/api_prototype/incremental_kernel_generator.dart';
import 'package:front_end/src/api_unstable/bazel_worker.dart' as fe;
import 'package:front_end/src/fasta/kernel/macro/macro.dart';
import 'package:kernel/ast.dart' show Component, Library, Reference;
import 'package:kernel/ast.dart'
show Component, Library, NonNullableByDefaultCompiledMode, Reference;
import 'package:kernel/target/targets.dart';
import 'package:vm/kernel_front_end.dart';
import 'package:vm/native_assets/synthesizer.dart';
import 'package:vm/target/flutter.dart';
import 'package:vm/target/flutter_runner.dart';
import 'package:vm/target/vm.dart';
@ -118,7 +121,8 @@ final summaryArgsParser = ArgParser()
..addOption('macro-serialization-mode',
help: 'The serialization mode for communicating with macros.',
allowed: ['bytedata', 'json'],
defaultsTo: 'bytedata');
defaultsTo: 'bytedata')
..addOption('native-assets', help: 'Path to native assets yaml file.');
class ComputeKernelResult {
final bool succeeded;
@ -428,6 +432,22 @@ Future<ComputeKernelResult> computeKernel(List<String> args,
List<int>? kernel;
bool wroteUsedDills = false;
var nativeAssets = parsedArgs['native-assets'];
Library? nativeAssetsLibrary;
if (nativeAssets != null) {
var nativeAssetsUri = Uri.base.resolve(nativeAssets);
nativeAssetsLibrary =
await NativeAssetsSynthesizer.synthesizeLibraryFromYamlFile(
nativeAssetsUri,
ErrorDetector(),
nonNullableByDefaultCompiledMode:
state.options.nnbdMode == fe.NnbdMode.Strong
? NonNullableByDefaultCompiledMode.Strong
: NonNullableByDefaultCompiledMode.Weak,
);
}
if (usingIncrementalCompiler) {
state.options.onDiagnostic = onDiagnostic;
IncrementalCompilerResult incrementalCompilerResult =
@ -467,10 +487,13 @@ Future<ComputeKernelResult> computeKernel(List<String> args,
}
makeStable(incrementalComponent);
setNativeAssetsLibrary(incrementalComponent, nativeAssetsLibrary);
return Future.value(fe.serializeComponent(incrementalComponent,
filter: excludeNonSources
? (library) => sources.contains(library.importUri)
? (library) =>
sources.contains(library.importUri) ||
library == nativeAssetsLibrary
: null,
includeOffsets: true));
});
@ -481,9 +504,12 @@ Future<ComputeKernelResult> computeKernel(List<String> args,
Component? component = await fe
.compileComponent(state, sources, onDiagnostic, buildSummary: summary);
if (component != null) {
setNativeAssetsLibrary(component, nativeAssetsLibrary);
kernel = fe.serializeComponent(component,
filter: excludeNonSources
? (library) => sources.contains(library.importUri)
? (library) =>
sources.contains(library.importUri) ||
library == nativeAssetsLibrary
: null,
includeOffsets: true);
}
@ -510,6 +536,19 @@ Future<ComputeKernelResult> computeKernel(List<String> args,
return ComputeKernelResult(succeeded, state);
}
final _nativeAssetsLibraryUri = Uri.parse('vm:ffi:native-assets');
void setNativeAssetsLibrary(
Component component, Library? nativeAssetsLibrary) async {
if (nativeAssetsLibrary == null) {
return;
}
assert(nativeAssetsLibrary.importUri == _nativeAssetsLibraryUri);
component.libraries
.removeWhere((l) => l.importUri == _nativeAssetsLibraryUri);
component.libraries.add(nativeAssetsLibrary..parent = component);
}
/// Make sure the output is stable by sorting libraries and additional exports.
void makeStable(Component c) {
// Make sure the output is stable.