Skip to content

Commit e5498bc

Browse files
fishythefishCommit Bot
authored andcommitted
[dart2js] Clean up some file paths.
* The wrapped abstract value domain is moved out of the powersets folder since they're unrelated. * {inferrer,ssa}/builder_kernel.dart renamed to just builder.dart since we only operate on kernel. * inferrer/inferrer_engine.dart renamed to engine.dart since it was redundant. Change-Id: I355e626431d8a49e9a944341360b2d6401895929 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/243645 Commit-Queue: Mayank Patke <[email protected]> Reviewed-by: Stephen Adams <[email protected]>
1 parent 4ee35ee commit e5498bc

22 files changed

+33
-33
lines changed

pkg/compiler/lib/src/compiler.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ import 'enqueue.dart' show Enqueuer;
3434
import 'environment.dart';
3535
import 'inferrer/abstract_value_domain.dart' show AbstractValueStrategy;
3636
import 'inferrer/trivial.dart' show TrivialAbstractValueStrategy;
37-
import 'inferrer/powersets/wrapped.dart' show WrappedAbstractValueStrategy;
3837
import 'inferrer/powersets/powersets.dart' show PowersetStrategy;
3938
import 'inferrer/typemasks/masks.dart' show TypeMaskStrategy;
4039
import 'inferrer/types.dart'
4140
show GlobalTypeInferenceResults, GlobalTypeInferenceTask;
41+
import 'inferrer/wrapped.dart' show WrappedAbstractValueStrategy;
4242
import 'ir/modular.dart';
4343
import 'js_backend/backend.dart' show CodegenInputs;
4444
import 'js_backend/enqueuer.dart';

pkg/compiler/lib/src/inferrer/builder_kernel.dart renamed to pkg/compiler/lib/src/inferrer/builder.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import '../options.dart';
2828
import '../universe/selector.dart';
2929
import '../universe/side_effects.dart';
3030
import '../util/util.dart';
31-
import 'inferrer_engine.dart';
31+
import 'engine.dart';
3232
import 'locals_handler.dart';
3333
import 'type_graph_nodes.dart';
3434
import 'type_system.dart';

pkg/compiler/lib/src/inferrer/closure_tracer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import '../common/names.dart' show Identifiers, Names;
1010
import '../elements/entities.dart';
1111
import '../universe/selector.dart' show Selector;
1212
import 'debug.dart' as debug;
13-
import 'inferrer_engine.dart';
13+
import 'engine.dart';
1414
import 'node_tracer.dart';
1515
import 'type_graph_nodes.dart';
1616

pkg/compiler/lib/src/inferrer/inferrer_engine.dart renamed to pkg/compiler/lib/src/inferrer/engine.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import '../universe/selector.dart';
3030
import '../universe/side_effects.dart';
3131
import '../world.dart';
3232
import 'abstract_value_domain.dart';
33-
import 'builder_kernel.dart';
33+
import 'builder.dart';
3434
import 'closure_tracer.dart';
3535
import 'debug.dart' as debug;
3636
import 'locals_handler.dart';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:kernel/ast.dart' as ir;
1111
import '../elements/entities.dart';
1212
import '../ir/util.dart';
1313
import '../util/util.dart';
14-
import 'inferrer_engine.dart';
14+
import 'engine.dart';
1515
import 'type_graph_nodes.dart';
1616

1717
/// A variable scope holds types for variables. It has a link to a

pkg/compiler/lib/src/inferrer/node_tracer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import '../elements/entities.dart';
1111
import '../util/util.dart' show Setlet;
1212
import 'abstract_value_domain.dart';
1313
import 'debug.dart' as debug;
14-
import 'inferrer_engine.dart';
14+
import 'engine.dart';
1515
import 'type_graph_nodes.dart';
1616

1717
// A set of selectors we know do not escape the elements inside the

pkg/compiler/lib/src/inferrer/type_graph_dump.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import '../../compiler_api.dart' as api;
1010
import '../elements/entities.dart';
1111
import '../elements/entity_utils.dart' as utils;
1212
import 'abstract_value_domain.dart';
13-
import 'inferrer_engine.dart';
13+
import 'engine.dart';
1414
import 'type_graph_nodes.dart';
1515
import 'debug.dart';
1616

pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import '../js_model/elements.dart' show JClosureCallMethod;
1818
import '../js_model/locals.dart';
1919
import '../world.dart';
2020
import 'abstract_value_domain.dart';
21-
import 'inferrer_engine.dart';
21+
import 'engine.dart';
2222
import 'type_graph_nodes.dart';
2323
import 'types.dart';
2424

pkg/compiler/lib/src/inferrer/type_graph_nodes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import '../world.dart' show JClosedWorld;
2020
import 'abstract_value_domain.dart';
2121
import 'debug.dart' as debug;
2222
import 'locals_handler.dart' show ArgumentsTypes;
23-
import 'inferrer_engine.dart';
23+
import 'engine.dart';
2424
import 'type_system.dart';
2525

2626
/// Common class for all nodes in the graph. The current nodes are:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ import '../common/names.dart';
1313
import '../common/tasks.dart' show CompilerTask;
1414
import '../compiler.dart' show Compiler;
1515
import '../elements/entities.dart';
16+
import '../inferrer/engine.dart';
17+
import '../inferrer/type_graph_inferrer.dart' show TypeGraphInferrer;
1618
import '../js_backend/inferred_data.dart';
1719
import '../js_model/element_map.dart';
1820
import '../js_model/js_world.dart';
1921
import '../js_model/locals.dart';
20-
import '../inferrer/type_graph_inferrer.dart' show TypeGraphInferrer;
2122
import '../serialization/serialization.dart';
2223
import '../universe/selector.dart' show Selector;
2324
import '../world.dart' show JClosedWorld;
2425
import 'abstract_value_domain.dart';
25-
import '../inferrer/inferrer_engine.dart';
2626

2727
/// Results about a single element (e.g. a method, parameter, or field)
2828
/// produced by the global type-inference algorithm.

0 commit comments

Comments
 (0)