Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 22d0f71

Browse files
author
Dart CI
committed
Version 2.13.0-126.0.dev
Merge commit '8bd30885885db16776653d30c242b48813ef3462' into 'dev'
2 parents f596cf7 + 8bd3088 commit 22d0f71

File tree

6 files changed

+31
-84
lines changed

6 files changed

+31
-84
lines changed

‎pkg/compiler/lib/src/ssa/optimize.dart‎

Lines changed: 14 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import '../js_backend/field_analysis.dart'
1818
show FieldAnalysisData, JFieldAnalysis;
1919
import '../js_backend/backend.dart' show CodegenInputs;
2020
import '../js_backend/native_data.dart' show NativeData;
21-
import '../js_backend/runtime_types_codegen.dart';
2221
import '../js_model/type_recipe.dart'
2322
show
2423
TypeRecipe,
@@ -89,37 +88,19 @@ class SsaOptimizerTask extends CompilerTask {
8988
List<OptimizationPhase> phases = <OptimizationPhase>[
9089
// Run trivial instruction simplification first to optimize
9190
// some patterns useful for type conversion.
92-
new SsaInstructionSimplifier(
93-
globalInferenceResults,
94-
_options,
95-
codegen.rtiSubstitutions,
96-
closedWorld,
97-
typeRecipeDomain,
98-
registry,
99-
log),
91+
new SsaInstructionSimplifier(globalInferenceResults, _options,
92+
closedWorld, typeRecipeDomain, registry, log),
10093
new SsaTypeConversionInserter(closedWorld),
10194
new SsaRedundantPhiEliminator(),
10295
new SsaDeadPhiEliminator(),
10396
new SsaTypePropagator(globalInferenceResults,
10497
closedWorld.commonElements, closedWorld, log),
10598
// After type propagation, more instructions can be
10699
// simplified.
107-
new SsaInstructionSimplifier(
108-
globalInferenceResults,
109-
_options,
110-
codegen.rtiSubstitutions,
111-
closedWorld,
112-
typeRecipeDomain,
113-
registry,
114-
log),
115-
new SsaInstructionSimplifier(
116-
globalInferenceResults,
117-
_options,
118-
codegen.rtiSubstitutions,
119-
closedWorld,
120-
typeRecipeDomain,
121-
registry,
122-
log),
100+
new SsaInstructionSimplifier(globalInferenceResults, _options,
101+
closedWorld, typeRecipeDomain, registry, log),
102+
new SsaInstructionSimplifier(globalInferenceResults, _options,
103+
closedWorld, typeRecipeDomain, registry, log),
123104
new SsaTypePropagator(globalInferenceResults,
124105
closedWorld.commonElements, closedWorld, log),
125106
// Run a dead code eliminator before LICM because dead
@@ -143,14 +124,8 @@ class SsaOptimizerTask extends CompilerTask {
143124
new SsaValueRangeAnalyzer(closedWorld, this),
144125
// Previous optimizations may have generated new
145126
// opportunities for instruction simplification.
146-
new SsaInstructionSimplifier(
147-
globalInferenceResults,
148-
_options,
149-
codegen.rtiSubstitutions,
150-
closedWorld,
151-
typeRecipeDomain,
152-
registry,
153-
log),
127+
new SsaInstructionSimplifier(globalInferenceResults, _options,
128+
closedWorld, typeRecipeDomain, registry, log),
154129
];
155130
phases.forEach(runPhase);
156131

@@ -171,14 +146,8 @@ class SsaOptimizerTask extends CompilerTask {
171146
new SsaGlobalValueNumberer(closedWorld.abstractValueDomain),
172147
new SsaCodeMotion(closedWorld.abstractValueDomain),
173148
new SsaValueRangeAnalyzer(closedWorld, this),
174-
new SsaInstructionSimplifier(
175-
globalInferenceResults,
176-
_options,
177-
codegen.rtiSubstitutions,
178-
closedWorld,
179-
typeRecipeDomain,
180-
registry,
181-
log),
149+
new SsaInstructionSimplifier(globalInferenceResults, _options,
150+
closedWorld, typeRecipeDomain, registry, log),
182151
new SsaSimplifyInterceptors(closedWorld, member.enclosingClass),
183152
new SsaDeadCodeEliminator(closedWorld, this),
184153
];
@@ -188,14 +157,8 @@ class SsaOptimizerTask extends CompilerTask {
188157
closedWorld.commonElements, closedWorld, log),
189158
// Run the simplifier to remove unneeded type checks inserted by
190159
// type propagation.
191-
new SsaInstructionSimplifier(
192-
globalInferenceResults,
193-
_options,
194-
codegen.rtiSubstitutions,
195-
closedWorld,
196-
typeRecipeDomain,
197-
registry,
198-
log),
160+
new SsaInstructionSimplifier(globalInferenceResults, _options,
161+
closedWorld, typeRecipeDomain, registry, log),
199162
];
200163
}
201164
phases.forEach(runPhase);
@@ -250,21 +213,14 @@ class SsaInstructionSimplifier extends HBaseVisitor
250213
final String name = "SsaInstructionSimplifier";
251214
final GlobalTypeInferenceResults _globalInferenceResults;
252215
final CompilerOptions _options;
253-
final RuntimeTypesSubstitutions _rtiSubstitutions;
254216
final JClosedWorld _closedWorld;
255217
final TypeRecipeDomain _typeRecipeDomain;
256218
final CodegenRegistry _registry;
257219
final OptimizationTestLog _log;
258220
HGraph _graph;
259221

260-
SsaInstructionSimplifier(
261-
this._globalInferenceResults,
262-
this._options,
263-
this._rtiSubstitutions,
264-
this._closedWorld,
265-
this._typeRecipeDomain,
266-
this._registry,
267-
this._log);
222+
SsaInstructionSimplifier(this._globalInferenceResults, this._options,
223+
this._closedWorld, this._typeRecipeDomain, this._registry, this._log);
268224

269225
JCommonElements get commonElements => _closedWorld.commonElements;
270226

@@ -1882,15 +1838,6 @@ class SsaInstructionSimplifier extends HBaseVisitor
18821838
return handleInterceptedCall(node);
18831839
}
18841840

1885-
bool needsSubstitutionForTypeVariableAccess(ClassEntity cls) {
1886-
if (_closedWorld.isUsedAsMixin(cls)) return true;
1887-
1888-
return _closedWorld.classHierarchy.anyStrictSubclassOf(cls,
1889-
(ClassEntity subclass) {
1890-
return !_rtiSubstitutions.isTrivialSubstitution(subclass, cls);
1891-
});
1892-
}
1893-
18941841
@override
18951842
HInstruction visitTypeEval(HTypeEval node) {
18961843
HInstruction environment = node.inputs.single;

‎pkg/dartdev/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Global options:
99
-h, --help Print this usage information.
1010
-v, --verbose Show additional command output.
1111
--version Print the Dart SDK version.
12-
--enable-analytics Enable anonymous analytics.
13-
--disable-analytics Disable anonymous analytics.
12+
--enable-analytics Enable analytics.
13+
--disable-analytics Disable analytics.
1414
1515
Available commands:
1616
analyze Analyze the project's Dart code.

‎pkg/dartdev/lib/dartdev.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,17 @@ class DartdevRunner extends CommandRunner<int> {
7979
argParser.addFlag('version',
8080
negatable: false, help: 'Print the Dart SDK version.');
8181
argParser.addFlag('enable-analytics',
82-
negatable: false, help: 'Enable anonymous analytics.');
82+
negatable: false, help: 'Enable analytics.');
8383
argParser.addFlag('disable-analytics',
84-
negatable: false, help: 'Disable anonymous analytics.');
84+
negatable: false, help: 'Disable analytics.');
8585

8686
argParser.addFlag('diagnostics',
8787
negatable: false, help: 'Show tool diagnostic output.', hide: !verbose);
8888

8989
argParser.addFlag(
9090
'analytics',
9191
negatable: true,
92-
help: 'Disable anonymous analytics for this `dart *` run',
92+
help: 'Disable analytics for this `dart *` run',
9393
hide: true,
9494
);
9595

@@ -152,7 +152,7 @@ class DartdevRunner extends CommandRunner<int> {
152152
} else if (topLevelResults['enable-analytics']) {
153153
analytics.enabled = true;
154154

155-
// Alert the user again that anonymous data will be collected.
155+
// Alert the user again that data will be collected.
156156
print(analyticsNoticeOnFirstRunMessage);
157157
return 0;
158158
}

‎pkg/dartdev/lib/src/analytics.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ import 'package:usage/usage_io.dart';
1414

1515
const String analyticsNoticeOnFirstRunMessage = '''
1616
╔════════════════════════════════════════════════════════════════════════════╗
17-
║ The Dart tool uses Google Analytics to anonymously report feature usage ║
18-
║ statistics and to send basic crash reports. This data is used to help ║
19-
║ improve the Dart platform and tools over time. ║
17+
║ The Dart tool uses Google Analytics to report feature usage statistics ║
18+
║ and to send basic crash reports. This data is used to help improve the ║
19+
║ Dart platform and tools over time. ║
2020
║ ║
21-
║ To disable reporting of anonymous analytics, run: ║
21+
║ To disable reporting of analytics, run: ║
2222
║ ║
2323
║ dart --disable-analytics ║
2424
║ ║
2525
╚════════════════════════════════════════════════════════════════════════════╝
2626
''';
2727
const String analyticsDisabledNoticeMessage = '''
2828
╔════════════════════════════════════════════════════════════════════════════╗
29-
║ Anonymous analytics reporting disabled. In order to enable it, run: ║
29+
║ Analytics reporting disabled. In order to enable it, run: ║
3030
║ ║
3131
║ dart --enable-analytics ║
3232
║ ║

‎pkg/dartdev/test/analytics_test.dart‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Future<void> main() async {
4545
var result = p.runSync(['--disable-analytics']);
4646
expect(result.stdout, contains('''
4747
╔════════════════════════════════════════════════════════════════════════════╗
48-
║ Anonymous analytics reporting disabled. In order to enable it, run: ║
48+
║ Analytics reporting disabled. In order to enable it, run: ║
4949
║ ║
5050
║ dart --enable-analytics ║
5151
║ ║
@@ -55,11 +55,11 @@ Future<void> main() async {
5555
result = p.runSync(['--enable-analytics']);
5656
expect(result.stdout, contains('''
5757
╔════════════════════════════════════════════════════════════════════════════╗
58-
║ The Dart tool uses Google Analytics to anonymously report feature usage ║
59-
║ statistics and to send basic crash reports. This data is used to help ║
60-
║ improve the Dart platform and tools over time. ║
58+
║ The Dart tool uses Google Analytics to report feature usage statistics ║
59+
║ and to send basic crash reports. This data is used to help improve the ║
60+
║ Dart platform and tools over time. ║
6161
║ ║
62-
║ To disable reporting of anonymous analytics, run: ║
62+
║ To disable reporting of analytics, run: ║
6363
║ ║
6464
║ dart --disable-analytics ║
6565
║ ║

‎tools/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ CHANNEL dev
2727
MAJOR 2
2828
MINOR 13
2929
PATCH 0
30-
PRERELEASE 125
30+
PRERELEASE 126
3131
PRERELEASE_PATCH 0

0 commit comments

Comments
 (0)