Skip to content

Commit ebd8429

Browse files
Revert: fix(tool): remove redundant --enable-experiment=record-use flag (flutter#190583)
Reverts: [fix(tool): remove redundant --enable-experiment=record-use flag](flutter#190475) Initiated by: @cbracken Reason for reverting: ``` Original PR Author: @kevmoo Reviewed By: @mdebbar The original PR description is provided below: When compiling web targets (dart2js and dart2wasm) or running dry runs with the record-use feature flag enabled, flutter_tools explicitly passed --enable-experiment=record-use to the compiler. Since record-use is enabled by default in recent Dart SDKs, passing this flag caused warning spam during standard compilation and dry runs. * Remove --enable-experiment=record-use from Dart2JSTarget and Dart2WasmTarget in web.dart. * Remove expected flag from test commands in web_test.dart and web_dry_run_test.dart. Fixes flutter#190465
1 parent fa4be6c commit ebd8429

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎packages/flutter_tools/lib/src/build_system/targets/web.dart‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,10 @@ class Dart2JSTarget extends Dart2WebTarget {
199199
else if (buildMode == BuildMode.release)
200200
'-Ddart.vm.product=true',
201201
for (final String dartDefine in computeDartDefines(environment)) '-D$dartDefine',
202-
if (featureFlags.isRecordUseEnabled) '--write-resources',
202+
if (featureFlags.isRecordUseEnabled) ...<String>[
203+
'--write-resources',
204+
'--enable-experiment=record-use',
205+
],
203206
];
204207

205208
// NOTE: most args should be populated in [toSharedCommandOptions].
@@ -371,8 +374,10 @@ class Dart2WasmTarget extends Dart2WebTarget {
371374
...decodeCommaSeparated(environment.defines, kExtraFrontEndOptions),
372375
for (final String dartDefine in dartDefines) '-D$dartDefine',
373376
'--extra-compiler-option=--depfile=${depFile.path}',
374-
if (featureFlags.isRecordUseEnabled)
377+
if (featureFlags.isRecordUseEnabled) ...<String>[
375378
'--recorded-uses=${environment.buildDir.childFile(LinkHooks.recordedUsesWasmFileName).path}',
379+
'--enable-experiment=record-use',
380+
],
376381
...compilerConfig.toCommandOptions(buildMode),
377382
'-o',
378383
outputWasmFile.path,

‎packages/flutter_tools/test/general.shard/build_system/targets/web_dry_run_test.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ name: my_app
9898
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
9999
'--extra-compiler-option=--depfile=${environment.buildDir.childFile('dart2wasm.d').path}',
100100
'--recorded-uses=${environment.buildDir.childFile('recorded_uses_wasm.json').path}',
101+
'--enable-experiment=record-use',
101102
'-O0',
102103
'--no-strip-wasm',
103104
'--no-minify',

‎packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const _kStandardFlutterWebDefines = <String>[
4141
'-DFLUTTER_WEB_USE_SKWASM=false',
4242
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
4343
'--write-resources',
44+
'--enable-experiment=record-use',
4445
];
4546

4647
const _kDart2WasmLinuxArgs = <String>[
@@ -1366,6 +1367,7 @@ _flutter.loader.load();
13661367
'-DFLUTTER_WEB_CANVASKIT_URL=https://www.gstatic.com/flutter-canvaskit/abcdefghijklmnopqrstuvwxyz/',
13671368
'--extra-compiler-option=--depfile=${depFile.absolute.path}',
13681369
'--recorded-uses=${environment.buildDir.childFile('recorded_uses_wasm.json').absolute.path}',
1370+
'--enable-experiment=record-use',
13691371
'-O$expectedLevel',
13701372
if (strip && buildMode == 'release')
13711373
'--strip-wasm'

0 commit comments

Comments
 (0)