Skip to content

Commit 9e8fdef

Browse files
schultekdart-scoped@luci-project-accounts.iam.gserviceaccount.com
authored andcommitted
Add annotation-based creation location tracking
Closes #63011 GitOrigin-RevId: 926534c Change-Id: I88460a060faabeae8f611e88f23b2eb5fc99f21a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/491702 Reviewed-by: Daco Harkes <[email protected]> Reviewed-by: Jens Johansen <[email protected]> Reviewed-by: Slava Egorov <[email protected]> Commit-Queue: Daco Harkes <[email protected]>
1 parent efff5f7 commit 9e8fdef

58 files changed

Lines changed: 1851 additions & 205 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkg/dart2bytecode/lib/dart2bytecode.dart‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,16 @@ final ArgParser _argParser = ArgParser(allowTrailingOptions: true)
109109
help: 'Print this help message.',
110110
)
111111
..addFlag(
112-
'track-widget-creation',
113-
help: 'Run a kernel transformer to track creation locations for widgets.',
112+
'track-creation-locations',
113+
help:
114+
'Run a kernel transformer to track creation locations for'
115+
' classes annotated with @pragma(\'track-creation-locations\').',
114116
defaultsTo: false,
117+
aliases: [
118+
// TODO(http://dartbug.com/63225): Remove this once flutter is migrated
119+
// to the new flag.
120+
'track-widget-creation',
121+
],
115122
)
116123
..addOption(
117124
'invocation-modes',
@@ -186,7 +193,7 @@ Future<int> runCompilerWithCommandLineArguments(List<String> arguments) async {
186193
final String? validateDynamicInterface = options['validate'];
187194
final String messageVerbosity = options['verbosity'];
188195
final String cfeInvocationModes = options['invocation-modes'];
189-
final bool trackWidgetCreation = options['track-widget-creation'];
196+
final bool trackCreationLocations = options['track-creation-locations'];
190197
final List<String>? bytecodeGeneratorOptions = options['bytecode-options'];
191198
final String libraryUrisPrefix = options['prefix-library-uris']!;
192199

@@ -205,7 +212,7 @@ Future<int> runCompilerWithCommandLineArguments(List<String> arguments) async {
205212
fileSystemRoots: fileSystemRoots,
206213
messageVerbosity: messageVerbosity,
207214
cfeInvocationModes: cfeInvocationModes,
208-
trackWidgetCreation: trackWidgetCreation,
215+
trackCreationLocations: trackCreationLocations,
209216
bytecodeGeneratorOptions: bytecodeGeneratorOptions,
210217
depfile: depfile,
211218
depfileTarget: depfileTarget,
@@ -231,7 +238,7 @@ Future<int> runCompilerWithOptions({
231238
String messageVerbosity = Verbosity.defaultValue,
232239
void Function(String) printMessage = print,
233240
String cfeInvocationModes = '',
234-
bool trackWidgetCreation = false,
241+
bool trackCreationLocations = false,
235242
List<String>? bytecodeGeneratorOptions,
236243
String? depfile,
237244
String? depfileTarget,
@@ -287,7 +294,7 @@ Future<int> runCompilerWithOptions({
287294
..verbosity = verbosity
288295
..target = createFrontEndTarget(
289296
targetName,
290-
trackWidgetCreation: trackWidgetCreation,
297+
trackCreationLocations: trackCreationLocations,
291298
supportMirrors: false,
292299
isClosureContextLoweringEnabled:
293300
bytecodeOptions.isClosureContextLoweringEnabled,

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ Future<CompilerResult> _compile(
270270
onWarning: print,
271271
);
272272

273-
var trackWidgetCreation = argResults.flag('track-widget-creation');
273+
var trackCreationLocations = argResults.flag('track-creation-locations');
274274
var oldCompilerState = compilerState;
275275
var recordUsedInputs = argResults.option('used-inputs-file') != null;
276276
var additionalDills = summaryModules.keys.toList();
@@ -290,7 +290,9 @@ Future<CompilerResult> _compile(
290290
packageFile != null ? sourcePathToUri(packageFile) : null,
291291
sourcePathToUri(librarySpecPath),
292292
additionalDills,
293-
DevCompilerTarget(TargetFlags(trackWidgetCreation: trackWidgetCreation)),
293+
DevCompilerTarget(
294+
TargetFlags(trackCreationLocations: trackCreationLocations),
295+
),
294296
fileSystem: fileSystem,
295297
explicitExperimentalFlags: explicitExperimentalFlags,
296298
environmentDefines: declaredVariables,
@@ -318,7 +320,7 @@ Future<CompilerResult> _compile(
318320
compilerState = await fe.initializeIncrementalCompiler(
319321
oldCompilerState,
320322
{
321-
'trackWidgetCreation=$trackWidgetCreation',
323+
'trackCreationLocations=$trackCreationLocations',
322324
'multiRootScheme=${fileSystem.markerScheme}',
323325
'multiRootRoots=${fileSystem.roots}',
324326
},
@@ -330,7 +332,9 @@ Future<CompilerResult> _compile(
330332
sourcePathToUri(librarySpecPath),
331333
additionalDills,
332334
inputDigests,
333-
DevCompilerTarget(TargetFlags(trackWidgetCreation: trackWidgetCreation)),
335+
DevCompilerTarget(
336+
TargetFlags(trackCreationLocations: trackCreationLocations),
337+
),
334338
fileSystem: fileSystem,
335339
explicitExperimentalFlags: explicitExperimentalFlags,
336340
environmentDefines: declaredVariables,

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,17 @@ class Options {
368368
hide: true,
369369
)
370370
..addFlag(
371-
'track-widget-creation',
372-
help: 'Enable inspecting of Flutter widgets.',
371+
'track-creation-locations',
372+
help:
373+
'Run a kernel transformer to track creation locations for'
374+
' classes annotated with @pragma(\'track-creation-locations\').',
373375
defaultsTo: false,
374376
hide: true,
377+
aliases: [
378+
// TODO(http://dartbug.com/63225): Remove this once flutter is
379+
// migrated to the new flag.
380+
'track-widget-creation',
381+
],
375382
)
376383
// TODO(jmesserly): add verbose help to show hidden options
377384
..addOption(

‎pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class ExpressionCompilerWorker {
201201
environmentDefines: environmentDefines,
202202
explicitExperimentalFlags: explicitExperimentalFlags,
203203
sdkRoot: _argToUri(parsedArgs.option('sdk-root')),
204-
trackWidgetCreation: parsedArgs.flag('track-widget-creation'),
204+
trackCreationLocations: parsedArgs.flag('track-creation-locations'),
205205
moduleFormat: moduleFormat,
206206
canaryFeatures: parsedArgs.flag('canary'),
207207
enableAsserts: parsedArgs.flag('enable-asserts'),
@@ -227,7 +227,7 @@ class ExpressionCompilerWorker {
227227
Map<String, String>? environmentDefines,
228228
Map<ExperimentalFlag, bool> explicitExperimentalFlags = const {},
229229
Uri? sdkRoot,
230-
bool trackWidgetCreation = false,
230+
bool trackCreationLocations = false,
231231
ModuleFormat moduleFormat = ModuleFormat.amd,
232232
bool canaryFeatures = false,
233233
bool enableAsserts = true,
@@ -244,7 +244,7 @@ class ExpressionCompilerWorker {
244244
..packagesFileUri = packagesFile
245245
..librariesSpecificationUri = librariesSpecificationUri
246246
..target = DevCompilerTarget(
247-
TargetFlags(trackWidgetCreation: trackWidgetCreation),
247+
TargetFlags(trackCreationLocations: trackCreationLocations),
248248
)
249249
..fileSystem = fileSystem
250250
..omitPlatform = true
@@ -889,7 +889,15 @@ final argParser = ArgParser()
889889
..addOption('asset-server-address')
890890
..addOption('asset-server-port')
891891
..addOption('module-format', defaultsTo: 'amd')
892-
..addFlag('track-widget-creation', defaultsTo: false)
892+
..addFlag(
893+
'track-creation-locations',
894+
defaultsTo: false,
895+
aliases: [
896+
// TODO(http://dartbug.com/63225): Remove this once flutter is
897+
// migrated to the new flag.
898+
'track-widget-creation',
899+
],
900+
)
893901
..addFlag('sound-null-safety', negatable: true, defaultsTo: true)
894902
..addFlag('canary', negatable: true, defaultsTo: false)
895903
// Disable asserts in compiled code by default, which is different

‎pkg/dev_compiler/lib/src/kernel/target.dart‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,28 @@ class DevCompilerTarget extends Target {
240240
}
241241
}
242242

243+
@override
244+
void performOutlineTransformations(
245+
Component component, {
246+
List<Library>? libraries,
247+
ChangedStructureNotifier? changedStructureNotifier,
248+
}) {
249+
super.performOutlineTransformations(
250+
component,
251+
libraries: libraries,
252+
changedStructureNotifier: changedStructureNotifier,
253+
);
254+
// In addition to [performPreConstantEvaluationTransformations] this makes
255+
// sure summaries are also transformed.
256+
if (flags.trackCreationLocations) {
257+
(_widgetTracker ??= WidgetCreatorTracker()).transform(
258+
libraries ?? component.libraries,
259+
component.libraries,
260+
changedStructureNotifier,
261+
);
262+
}
263+
}
264+
243265
@override
244266
void performPreConstantEvaluationTransformations(
245267
Component component,
@@ -249,9 +271,12 @@ class DevCompilerTarget extends Target {
249271
void Function(String msg)? logger,
250272
ChangedStructureNotifier? changedStructureNotifier,
251273
}) {
252-
if (flags.trackWidgetCreation) {
253-
_widgetTracker ??= WidgetCreatorTracker();
254-
_widgetTracker!.transform(component, libraries, changedStructureNotifier);
274+
if (flags.trackCreationLocations) {
275+
(_widgetTracker ??= WidgetCreatorTracker()).transform(
276+
libraries,
277+
component.libraries,
278+
changedStructureNotifier,
279+
);
255280
}
256281
}
257282

‎pkg/dev_compiler/test/memory_compiler.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Future<MemoryComponentResult> componentFromMemory(
7777
null,
7878
sourcePathToUri(defaultLibrarySpecPath),
7979
[],
80-
DevCompilerTarget(TargetFlags(trackWidgetCreation: false)),
80+
DevCompilerTarget(TargetFlags(trackCreationLocations: false)),
8181
fileSystem: fe.HybridFileSystem(memoryFileSystem),
8282
environmentDefines: {},
8383
explicitExperimentalFlags: explicitExperimentalFlags,
@@ -134,7 +134,7 @@ Future<MemoryComponentResult> incrementalComponentFromMemory(
134134
sourcePathToUri(defaultLibrarySpecPath),
135135
[],
136136
inputDigests,
137-
DevCompilerTarget(TargetFlags(trackWidgetCreation: false)),
137+
DevCompilerTarget(TargetFlags(trackCreationLocations: false)),
138138
fileSystem: fe.HybridFileSystem(memoryFileSystem),
139139
environmentDefines: {},
140140
explicitExperimentalFlags: explicitExperimentalFlags,

‎pkg/front_end/lib/src/base/incremental_compiler.dart‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,12 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
443443
}
444444
// Coverage-ignore(suite): Not run.
445445
else if (componentWithDill != null) {
446-
context.options.target.performOutlineTransformations(componentWithDill);
446+
context.options.target.performOutlineTransformations(
447+
componentWithDill,
448+
libraries: currentKernelTarget.loader.libraries,
449+
changedStructureNotifier:
450+
currentKernelTarget.changedStructureNotifier,
451+
);
447452
}
448453

449454
_benchmarker

‎pkg/front_end/test/constant_evaluator_benchmark.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@ Future<void> main(List<String> arguments) async {
190190

191191
CompilerContext setupCompilerContext(
192192
String targetString,
193-
bool widgetTransformation,
193+
bool trackCreationLocations,
194194
Uri platformUri,
195195
Uri mainUri,
196196
) {
197197
CompilerOptions options = getOptions();
198198

199199
TargetFlags targetFlags = new TargetFlags(
200-
trackWidgetCreation: widgetTransformation,
200+
trackCreationLocations: trackCreationLocations,
201201
);
202202
Target target;
203203
switch (targetString) {

‎pkg/front_end/test/crashing_test_case_minimizer.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Future<void> main(List<String> arguments) async {
5656
for (String s in arg.substring("--invalidate=".length).split(",")) {
5757
settings.invalidate.add(Uri.base.resolve(s));
5858
}
59-
} else if (arg.startsWith("--widgetTransformation")) {
60-
settings.widgetTransformation = true;
59+
} else if (arg.startsWith("--track-creation-locations")) {
60+
settings.trackCreationLocations = true;
6161
} else if (arg.startsWith("--target=vm")) {
6262
settings.targetString = "vm";
6363
} else if (arg.startsWith("--target=flutter")) {

‎pkg/front_end/test/crashing_test_case_minimizer_impl.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class TestMinimizerSettings {
6868
bool invalidateAllAtOnce = false;
6969
bool experimentalInvalidation = false;
7070
bool serialize = false;
71-
bool widgetTransformation = false;
71+
bool trackCreationLocations = false;
7272
final List<Uri> invalidate = [];
7373
String targetString = "vm";
7474
bool noTryToDeleteEmptyFilesUpFront = false;
@@ -103,7 +103,7 @@ class TestMinimizerSettings {
103103
'initialOnlyOutline': initialOnlyOutline,
104104
'experimentalInvalidation': experimentalInvalidation,
105105
'serialize': serialize,
106-
'widgetTransformation': widgetTransformation,
106+
'trackCreationLocations': trackCreationLocations,
107107
'invalidate': invalidate.map((uri) => uri.toString()).toList(),
108108
'targetString': targetString,
109109
'noTryToDeleteEmptyFilesUpFront': noTryToDeleteEmptyFilesUpFront,
@@ -134,7 +134,7 @@ class TestMinimizerSettings {
134134
initialOnlyOutline = json["initialOnlyOutline"];
135135
experimentalInvalidation = json["experimentalInvalidation"];
136136
serialize = json["serialize"];
137-
widgetTransformation = json["widgetTransformation"];
137+
trackCreationLocations = json["trackCreationLocations"];
138138
invalidate.clear();
139139
invalidate.addAll(
140140
(json["invalidate"] as List).map((uriString) => Uri.parse(uriString)),
@@ -802,8 +802,8 @@ class TestMinimizer {
802802
# Reproduce a crash.
803803
804804
type: newworld""");
805-
if (_settings.widgetTransformation) {
806-
print("trackWidgetCreation: true");
805+
if (_settings.trackCreationLocations) {
806+
print("trackCreationLocations: true");
807807
print("target: dartdevc # needed for widget creation to be run");
808808
}
809809
print("""
@@ -2259,7 +2259,7 @@ worlds:
22592259
}
22602260

22612261
TargetFlags targetFlags = new TargetFlags(
2262-
trackWidgetCreation: _settings.widgetTransformation,
2262+
trackCreationLocations: _settings.trackCreationLocations,
22632263
);
22642264
Target target;
22652265
switch (_settings.targetString) {

0 commit comments

Comments
 (0)