Skip to content

Commit 6a8c988

Browse files
munificentcommit-bot@chromium.org
munificent
authored and
[email protected]
committed
Simplify the computeCompilerArguments().
I was reading through this code to think about how to push the NNBD and experiment flags in and this seemed like an easy improvement to do while I was here. Change-Id: I78b8989e0b4b552eb99a52c02cdd2cd619ebb219 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/115612 Auto-Submit: Bob Nystrom <[email protected]> Commit-Queue: Mayank Patke <[email protected]> Reviewed-by: Mayank Patke <[email protected]>
1 parent 9a847a9 commit 6a8c988

File tree

3 files changed

+32
-75
lines changed

3 files changed

+32
-75
lines changed

‎pkg/test_runner/lib/src/compiler_configuration.dart‎

Lines changed: 28 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,12 @@ abstract class CompilerConfiguration {
124124
}
125125

126126
List<String> computeCompilerArguments(
127-
List<String> vmOptions,
128-
List<String> sharedOptions,
129-
List<String> dartOptions,
130-
List<String> dart2jsOptions,
131-
List<String> ddcOptions,
132-
List<String> args) {
133-
return [...sharedOptions, ..._configuration.sharedOptions, ...args];
127+
TestFile testFile, List<String> vmOptions, List<String> args) {
128+
return [
129+
...testFile.sharedOptions,
130+
..._configuration.sharedOptions,
131+
...args
132+
];
134133
}
135134

136135
List<String> computeRuntimeArguments(
@@ -202,14 +201,9 @@ class VMKernelCompilerConfiguration extends CompilerConfiguration
202201

203202
@override
204203
List<String> computeCompilerArguments(
205-
List<String> vmOptions,
206-
List<String> sharedOptions,
207-
List<String> dartOptions,
208-
List<String> dart2jsOptions,
209-
List<String> ddcOptions,
210-
List<String> args) {
204+
TestFile testFile, List<String> vmOptions, List<String> args) {
211205
return [
212-
...sharedOptions,
206+
...testFile.sharedOptions,
213207
..._configuration.sharedOptions,
214208
...vmOptions,
215209
...args
@@ -323,17 +317,12 @@ class ComposedCompilerConfiguration extends CompilerConfiguration {
323317
}
324318

325319
List<String> computeCompilerArguments(
326-
List<String> vmOptions,
327-
List<String> sharedOptions,
328-
List<String> dartOptions,
329-
List<String> dart2jsOptions,
330-
List<String> ddcOptions,
331-
List<String> args) {
320+
TestFile testFile, List<String> vmOptions, List<String> args) {
332321
// The result will be passed as an input to [extractArguments]
333322
// (i.e. the arguments to the [PipelineCommand]).
334323
return [
335324
...vmOptions,
336-
...sharedOptions,
325+
...testFile.sharedOptions,
337326
..._configuration.sharedOptions,
338327
...args
339328
];
@@ -413,16 +402,11 @@ class Dart2jsCompilerConfiguration extends Dart2xCompilerConfiguration {
413402
: super('dart2js', configuration);
414403

415404
List<String> computeCompilerArguments(
416-
List<String> vmOptions,
417-
List<String> sharedOptions,
418-
List<String> dartOptions,
419-
List<String> dart2jsOptions,
420-
List<String> ddcOptions,
421-
List<String> args) {
405+
TestFile testFile, List<String> vmOptions, List<String> args) {
422406
return [
423-
...sharedOptions,
407+
...testFile.sharedOptions,
424408
..._configuration.sharedOptions,
425-
...dart2jsOptions,
409+
...testFile.dart2jsOptions,
426410
...args
427411
];
428412
}
@@ -494,16 +478,11 @@ class DevCompilerConfiguration extends CompilerConfiguration {
494478
}
495479

496480
List<String> computeCompilerArguments(
497-
List<String> vmOptions,
498-
List<String> sharedOptions,
499-
List<String> dartOptions,
500-
List<String> dart2jsOptions,
501-
List<String> ddcOptions,
502-
List<String> args) {
481+
TestFile testFile, List<String> vmOptions, List<String> args) {
503482
return [
504-
...sharedOptions,
483+
...testFile.sharedOptions,
505484
..._configuration.sharedOptions,
506-
...ddcOptions,
485+
...testFile.ddcOptions,
507486
// The file being compiled is the last argument.
508487
args.last
509488
];
@@ -805,18 +784,13 @@ class PrecompilerCompilerConfiguration extends CompilerConfiguration
805784
}
806785

807786
List<String> computeCompilerArguments(
808-
List<String> vmOptions,
809-
List<String> sharedOptions,
810-
List<String> dartOptions,
811-
List<String> dart2jsOptions,
812-
List<String> ddcOptions,
813-
List<String> originalArguments) {
787+
TestFile testFile, List<String> vmOptions, List<String> args) {
814788
return [
815789
if (_useEnableAsserts) '--enable_asserts',
816790
...filterVmOptions(vmOptions),
817-
...sharedOptions,
791+
...testFile.sharedOptions,
818792
..._configuration.sharedOptions,
819-
...originalArguments
793+
...args
820794
];
821795
}
822796

@@ -880,19 +854,14 @@ class AppJitCompilerConfiguration extends CompilerConfiguration {
880854
}
881855

882856
List<String> computeCompilerArguments(
883-
List<String> vmOptions,
884-
List<String> sharedOptions,
885-
List<String> dartOptions,
886-
List<String> dart2jsOptions,
887-
List<String> ddcOptions,
888-
List<String> originalArguments) {
857+
TestFile testFile, List<String> vmOptions, List<String> args) {
889858
return [
890859
if (_useEnableAsserts) '--enable_asserts',
891860
...vmOptions,
892-
...sharedOptions,
861+
...testFile.sharedOptions,
893862
..._configuration.sharedOptions,
894-
...originalArguments,
895-
...dartOptions
863+
...args,
864+
...testFile.dartOptions
896865
];
897866
}
898867

@@ -1160,13 +1129,11 @@ class FastaCompilerConfiguration extends CompilerConfiguration {
11601129

11611130
@override
11621131
List<String> computeCompilerArguments(
1163-
List<String> vmOptions,
1164-
List<String> sharedOptions,
1165-
List<String> dartOptions,
1166-
List<String> dart2jsOptions,
1167-
List<String> ddcOptions,
1168-
List<String> args) {
1169-
var arguments = [...sharedOptions, ..._configuration.sharedOptions];
1132+
TestFile testFile, List<String> vmOptions, List<String> args) {
1133+
var arguments = [
1134+
...testFile.sharedOptions,
1135+
..._configuration.sharedOptions
1136+
];
11701137
for (var argument in args) {
11711138
if (argument == "--ignore-unrecognized-flags") continue;
11721139
arguments.add(argument);

‎pkg/test_runner/lib/src/process_queue.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ abstract class CommandExecutor {
500500
Future cleanup();
501501
// TODO(kustermann): The [timeout] parameter should be a property of Command.
502502
Future<CommandOutput> runCommand(
503-
Node<Command> node, covariant Command command, int timeout);
503+
Node<Command> node, Command command, int timeout);
504504
}
505505

506506
class CommandExecutorImpl implements CommandExecutor {

‎pkg/test_runner/lib/src/test_suite.dart‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -696,12 +696,7 @@ class StandardTestSuite extends TestSuite {
696696
String tempDir;
697697
if (compilerConfiguration.hasCompiler) {
698698
compileTimeArguments = compilerConfiguration.computeCompilerArguments(
699-
vmOptions,
700-
testFile.sharedOptions,
701-
testFile.dartOptions,
702-
testFile.dart2jsOptions,
703-
testFile.ddcOptions,
704-
args);
699+
testFile, vmOptions, args);
705700
// Avoid doing this for analyzer.
706701
var path = testFile.path;
707702
if (vmOptionsVariant != 0) {
@@ -868,13 +863,8 @@ class StandardTestSuite extends TestSuite {
868863
};
869864
assert(supportedCompilers.contains(configuration.compiler));
870865

871-
var args = configuration.compilerConfiguration.computeCompilerArguments(
872-
null,
873-
testFile.sharedOptions,
874-
null,
875-
testFile.dart2jsOptions,
876-
testFile.ddcOptions,
877-
commonArguments);
866+
var args = configuration.compilerConfiguration
867+
.computeCompilerArguments(testFile, null, commonArguments);
878868
var compilation = configuration.compilerConfiguration
879869
.computeCompilationArtifact(outputDir, args, environmentOverrides);
880870
commands.addAll(compilation.commands);

0 commit comments

Comments
 (0)