Skip to content

Commit 1af4a6a

Browse files
rakudramaCommit Queue
authored and
Commit Queue
committed
[dart2js] Migrate js_backend/specialized_checks.dart
Also prepare some ssa/ files by importing world_iterfaces.dart Change-Id: Ifa1c61d27a32619baec60ab7835f66e36dee3bf5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/261283 Reviewed-by: Mayank Patke <[email protected]> Commit-Queue: Stephen Adams <[email protected]>
1 parent 3973013 commit 1af4a6a

14 files changed

+21
-19
lines changed

pkg/compiler/lib/src/js_backend/specialized_checks.dart

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// @dart = 2.10
6-
75
import '../common/elements.dart' show ElementEnvironment, JCommonElements;
86
import '../deferred_load/output_unit.dart' show OutputUnitData;
97
import '../elements/entities.dart';
108
import '../elements/types.dart';
119
import '../js_backend/interceptor_data.dart' show InterceptorData;
1210
import '../universe/class_hierarchy.dart' show ClassHierarchy;
13-
import '../world.dart' show JClosedWorld;
11+
import '../world_interfaces.dart' show JClosedWorld;
1412

1513
enum IsTestSpecialization {
1614
isNull,
@@ -24,7 +22,7 @@ enum IsTestSpecialization {
2422
}
2523

2624
class SpecializedChecks {
27-
static IsTestSpecialization findIsTestSpecialization(
25+
static IsTestSpecialization? findIsTestSpecialization(
2826
DartType dartType, MemberEntity compiland, JClosedWorld closedWorld) {
2927
if (dartType is LegacyType) {
3028
DartType base = dartType.baseType;
@@ -37,7 +35,7 @@ class SpecializedChecks {
3735
return _findIsTestSpecialization(dartType, compiland, closedWorld);
3836
}
3937

40-
static IsTestSpecialization _findIsTestSpecialization(
38+
static IsTestSpecialization? _findIsTestSpecialization(
4139
DartType dartType, MemberEntity compiland, JClosedWorld closedWorld) {
4240
if (dartType is InterfaceType) {
4341
ClassEntity element = dartType.element;
@@ -108,7 +106,7 @@ class SpecializedChecks {
108106
return null;
109107
}
110108

111-
static MemberEntity findAsCheck(DartType dartType,
109+
static MemberEntity? findAsCheck(DartType dartType,
112110
JCommonElements commonElements, bool useLegacySubtyping) {
113111
if (dartType is InterfaceType) {
114112
if (dartType.typeArguments.isNotEmpty) return null;
@@ -149,9 +147,9 @@ class SpecializedChecks {
149147
/// String nullable: false legacy: true String yes
150148
/// String nullable: false legacy: false String no
151149
///
152-
static MemberEntity _findAsCheck(
150+
static MemberEntity? _findAsCheck(
153151
ClassEntity element, JCommonElements commonElements,
154-
{bool nullable, bool legacy}) {
152+
{required bool nullable, required bool legacy}) {
155153
if (element == commonElements.jsStringClass ||
156154
element == commonElements.stringClass) {
157155
if (legacy) return commonElements.specializedAsStringLegacy;

pkg/compiler/lib/src/ssa/codegen_helpers.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import '../elements/entities.dart';
99
import '../inferrer/abstract_value_domain.dart';
1010
import '../options.dart';
1111
import '../universe/selector.dart' show Selector;
12-
import '../world.dart' show JClosedWorld;
12+
import '../world_interfaces.dart' show JClosedWorld;
1313
import 'codegen.dart' show CodegenPhase;
1414
import 'nodes.dart';
1515

pkg/compiler/lib/src/ssa/interceptor_finalizer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import '../elements/entities.dart';
99
import '../inferrer/abstract_value_domain.dart';
1010
import '../js_backend/interceptor_data.dart';
1111
import '../universe/selector.dart' show Selector;
12-
import '../world.dart' show JClosedWorld;
12+
import '../world_interfaces.dart' show JClosedWorld;
1313
import 'nodes.dart';
1414
import 'optimize.dart';
1515

pkg/compiler/lib/src/ssa/interceptor_simplifier.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import '../elements/entities.dart';
1010
import '../inferrer/abstract_value_domain.dart';
1111
import '../js_backend/interceptor_data.dart';
1212
import '../universe/selector.dart' show Selector;
13-
import '../world.dart' show JClosedWorld;
13+
import '../world_interfaces.dart' show JClosedWorld;
1414
import 'nodes.dart';
1515
import 'optimize.dart';
1616

pkg/compiler/lib/src/ssa/invoke_dynamic_specializers.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import '../elements/names.dart';
1212
import '../inferrer/abstract_value_domain.dart';
1313
import '../inferrer/types.dart';
1414
import '../universe/selector.dart';
15-
import '../world.dart' show JClosedWorld;
15+
import '../world_interfaces.dart' show JClosedWorld;
1616
import 'logging.dart';
1717
import 'nodes.dart';
1818
import 'types.dart';

pkg/compiler/lib/src/ssa/locals_handler.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import '../js_backend/native_data.dart';
1717
import '../js_backend/interceptor_data.dart';
1818
import '../js_model/closure.dart' show JRecordField, JClosureField;
1919
import '../js_model/locals.dart' show GlobalLocalsMap, JLocal;
20-
import '../world.dart' show JClosedWorld;
20+
import '../world_interfaces.dart' show JClosedWorld;
2121

2222
import 'builder.dart';
2323
import 'nodes.dart';

pkg/compiler/lib/src/ssa/nodes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import '../options.dart';
2626
import '../universe/selector.dart' show Selector;
2727
import '../universe/side_effects.dart' show SideEffects;
2828
import '../util/util.dart';
29-
import '../world.dart' show JClosedWorld;
29+
import '../world_interfaces.dart' show JClosedWorld;
3030
import 'invoke_dynamic_specializers.dart';
3131
import 'validate.dart';
3232

pkg/compiler/lib/src/ssa/tracer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import '../diagnostics/invariant.dart' show DEBUG_MODE;
1111
import '../inferrer/abstract_value_domain.dart';
1212
import '../js_backend/namer.dart' show suffixForGetInterceptor;
1313
import '../tracer.dart';
14-
import '../world.dart' show JClosedWorld;
14+
import '../world_interfaces.dart' show JClosedWorld;
1515
import 'nodes.dart';
1616

1717
/// Outputs SSA code in a format readable by Hydra IR.

pkg/compiler/lib/src/ssa/types.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import '../inferrer/abstract_value_domain.dart';
1111
import '../inferrer/types.dart';
1212
import '../native/behavior.dart';
1313
import '../universe/selector.dart' show Selector;
14-
import '../world.dart' show JClosedWorld;
14+
import '../world_interfaces.dart' show JClosedWorld;
1515

1616
class AbstractValueFactory {
1717
static AbstractValue inferredReturnTypeForElement(

pkg/compiler/lib/src/ssa/types_propagation.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import '../elements/types.dart';
1010
import '../inferrer/abstract_value_domain.dart';
1111
import '../inferrer/types.dart';
1212
import '../universe/selector.dart' show Selector;
13-
import '../world.dart' show JClosedWorld;
13+
import '../world_interfaces.dart' show JClosedWorld;
1414
import 'logging.dart';
1515
import 'nodes.dart';
1616
import 'optimize.dart';

pkg/compiler/lib/src/ssa/value_range_analyzer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import '../constants/constant_system.dart' as constant_system;
88
import '../constants/values.dart';
9-
import '../world.dart' show JClosedWorld;
9+
import '../world_interfaces.dart' show JClosedWorld;
1010
import 'nodes.dart';
1111
import 'optimize.dart';
1212

pkg/compiler/lib/src/universe/resolution_world_builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import '../native/enqueue.dart' show NativeResolutionEnqueuer;
2525
import '../options.dart';
2626
import '../util/enumset.dart';
2727
import '../util/util.dart';
28-
import '../world.dart' show World;
28+
import '../world_interfaces.dart' show World;
2929
import 'call_structure.dart';
3030
import 'class_hierarchy.dart' show ClassHierarchyBuilder;
3131
import 'class_set.dart';

pkg/compiler/lib/src/world.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ abstract class JClosedWorld implements interfaces.JClosedWorld {
8686
@override
8787
ClosureData get closureDataLookup;
8888

89+
@override
8990
OutputUnitData get outputUnitData;
9091

9192
/// The [Sorter] used for sorting elements in the generated code.

pkg/compiler/lib/src/world_interfaces.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:compiler/src/js_model/element_map_interfaces.dart';
77
import 'closure.dart';
88
import 'package:kernel/ast.dart' as ir;
99
import 'common/elements.dart';
10+
import 'deferred_load/output_unit.dart' show OutputUnitData;
1011
import 'elements/entities.dart';
1112
import 'elements/names.dart';
1213
import 'elements/types.dart';
@@ -37,6 +38,8 @@ abstract class JClosedWorld implements World {
3738

3839
ClosureData get closureDataLookup;
3940

41+
OutputUnitData get outputUnitData;
42+
4043
InterceptorData get interceptorData;
4144

4245
Iterable<MemberEntity> get liveInstanceMembers;

0 commit comments

Comments
 (0)