[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 <fishythefish@google.com>
Reviewed-by: Stephen Adams <sra@google.com>
This commit is contained in:
Mayank Patke 2022-05-10 21:36:13 +00:00 committed by Commit Bot
parent 4ee35ee998
commit e5498bcd40
22 changed files with 33 additions and 33 deletions

View file

@ -34,11 +34,11 @@ import 'enqueue.dart' show Enqueuer;
import 'environment.dart'; import 'environment.dart';
import 'inferrer/abstract_value_domain.dart' show AbstractValueStrategy; import 'inferrer/abstract_value_domain.dart' show AbstractValueStrategy;
import 'inferrer/trivial.dart' show TrivialAbstractValueStrategy; import 'inferrer/trivial.dart' show TrivialAbstractValueStrategy;
import 'inferrer/powersets/wrapped.dart' show WrappedAbstractValueStrategy;
import 'inferrer/powersets/powersets.dart' show PowersetStrategy; import 'inferrer/powersets/powersets.dart' show PowersetStrategy;
import 'inferrer/typemasks/masks.dart' show TypeMaskStrategy; import 'inferrer/typemasks/masks.dart' show TypeMaskStrategy;
import 'inferrer/types.dart' import 'inferrer/types.dart'
show GlobalTypeInferenceResults, GlobalTypeInferenceTask; show GlobalTypeInferenceResults, GlobalTypeInferenceTask;
import 'inferrer/wrapped.dart' show WrappedAbstractValueStrategy;
import 'ir/modular.dart'; import 'ir/modular.dart';
import 'js_backend/backend.dart' show CodegenInputs; import 'js_backend/backend.dart' show CodegenInputs;
import 'js_backend/enqueuer.dart'; import 'js_backend/enqueuer.dart';

View file

@ -28,7 +28,7 @@ import '../options.dart';
import '../universe/selector.dart'; import '../universe/selector.dart';
import '../universe/side_effects.dart'; import '../universe/side_effects.dart';
import '../util/util.dart'; import '../util/util.dart';
import 'inferrer_engine.dart'; import 'engine.dart';
import 'locals_handler.dart'; import 'locals_handler.dart';
import 'type_graph_nodes.dart'; import 'type_graph_nodes.dart';
import 'type_system.dart'; import 'type_system.dart';

View file

@ -10,7 +10,7 @@ import '../common/names.dart' show Identifiers, Names;
import '../elements/entities.dart'; import '../elements/entities.dart';
import '../universe/selector.dart' show Selector; import '../universe/selector.dart' show Selector;
import 'debug.dart' as debug; import 'debug.dart' as debug;
import 'inferrer_engine.dart'; import 'engine.dart';
import 'node_tracer.dart'; import 'node_tracer.dart';
import 'type_graph_nodes.dart'; import 'type_graph_nodes.dart';

View file

@ -30,7 +30,7 @@ import '../universe/selector.dart';
import '../universe/side_effects.dart'; import '../universe/side_effects.dart';
import '../world.dart'; import '../world.dart';
import 'abstract_value_domain.dart'; import 'abstract_value_domain.dart';
import 'builder_kernel.dart'; import 'builder.dart';
import 'closure_tracer.dart'; import 'closure_tracer.dart';
import 'debug.dart' as debug; import 'debug.dart' as debug;
import 'locals_handler.dart'; import 'locals_handler.dart';

View file

@ -11,7 +11,7 @@ import 'package:kernel/ast.dart' as ir;
import '../elements/entities.dart'; import '../elements/entities.dart';
import '../ir/util.dart'; import '../ir/util.dart';
import '../util/util.dart'; import '../util/util.dart';
import 'inferrer_engine.dart'; import 'engine.dart';
import 'type_graph_nodes.dart'; import 'type_graph_nodes.dart';
/// A variable scope holds types for variables. It has a link to a /// A variable scope holds types for variables. It has a link to a

View file

@ -11,7 +11,7 @@ import '../elements/entities.dart';
import '../util/util.dart' show Setlet; import '../util/util.dart' show Setlet;
import 'abstract_value_domain.dart'; import 'abstract_value_domain.dart';
import 'debug.dart' as debug; import 'debug.dart' as debug;
import 'inferrer_engine.dart'; import 'engine.dart';
import 'type_graph_nodes.dart'; import 'type_graph_nodes.dart';
// A set of selectors we know do not escape the elements inside the // A set of selectors we know do not escape the elements inside the

View file

@ -10,7 +10,7 @@ import '../../compiler_api.dart' as api;
import '../elements/entities.dart'; import '../elements/entities.dart';
import '../elements/entity_utils.dart' as utils; import '../elements/entity_utils.dart' as utils;
import 'abstract_value_domain.dart'; import 'abstract_value_domain.dart';
import 'inferrer_engine.dart'; import 'engine.dart';
import 'type_graph_nodes.dart'; import 'type_graph_nodes.dart';
import 'debug.dart'; import 'debug.dart';

View file

@ -18,7 +18,7 @@ import '../js_model/elements.dart' show JClosureCallMethod;
import '../js_model/locals.dart'; import '../js_model/locals.dart';
import '../world.dart'; import '../world.dart';
import 'abstract_value_domain.dart'; import 'abstract_value_domain.dart';
import 'inferrer_engine.dart'; import 'engine.dart';
import 'type_graph_nodes.dart'; import 'type_graph_nodes.dart';
import 'types.dart'; import 'types.dart';

View file

@ -20,7 +20,7 @@ import '../world.dart' show JClosedWorld;
import 'abstract_value_domain.dart'; import 'abstract_value_domain.dart';
import 'debug.dart' as debug; import 'debug.dart' as debug;
import 'locals_handler.dart' show ArgumentsTypes; import 'locals_handler.dart' show ArgumentsTypes;
import 'inferrer_engine.dart'; import 'engine.dart';
import 'type_system.dart'; import 'type_system.dart';
/// Common class for all nodes in the graph. The current nodes are: /// Common class for all nodes in the graph. The current nodes are:

View file

@ -13,16 +13,16 @@ import '../common/names.dart';
import '../common/tasks.dart' show CompilerTask; import '../common/tasks.dart' show CompilerTask;
import '../compiler.dart' show Compiler; import '../compiler.dart' show Compiler;
import '../elements/entities.dart'; import '../elements/entities.dart';
import '../inferrer/engine.dart';
import '../inferrer/type_graph_inferrer.dart' show TypeGraphInferrer;
import '../js_backend/inferred_data.dart'; import '../js_backend/inferred_data.dart';
import '../js_model/element_map.dart'; import '../js_model/element_map.dart';
import '../js_model/js_world.dart'; import '../js_model/js_world.dart';
import '../js_model/locals.dart'; import '../js_model/locals.dart';
import '../inferrer/type_graph_inferrer.dart' show TypeGraphInferrer;
import '../serialization/serialization.dart'; import '../serialization/serialization.dart';
import '../universe/selector.dart' show Selector; import '../universe/selector.dart' show Selector;
import '../world.dart' show JClosedWorld; import '../world.dart' show JClosedWorld;
import 'abstract_value_domain.dart'; import 'abstract_value_domain.dart';
import '../inferrer/inferrer_engine.dart';
/// Results about a single element (e.g. a method, parameter, or field) /// Results about a single element (e.g. a method, parameter, or field)
/// produced by the global type-inference algorithm. /// produced by the global type-inference algorithm.

View file

@ -4,17 +4,17 @@
// @dart = 2.10 // @dart = 2.10
import '../../constants/values.dart' show ConstantValue, PrimitiveConstantValue; import '../constants/values.dart' show ConstantValue, PrimitiveConstantValue;
import '../../elements/entities.dart'; import '../elements/entities.dart';
import '../../elements/names.dart'; import '../elements/names.dart';
import '../../elements/types.dart' show DartType; import '../elements/types.dart' show DartType;
import '../../ir/static_type.dart'; import '../ir/static_type.dart';
import '../../serialization/serialization.dart'; import '../serialization/serialization.dart';
import '../../universe/selector.dart'; import '../universe/selector.dart';
import '../../universe/world_builder.dart'; import '../universe/world_builder.dart';
import '../../universe/use.dart'; import '../universe/use.dart';
import '../../world.dart'; import '../world.dart';
import '../abstract_value_domain.dart'; import 'abstract_value_domain.dart';
class WrappedAbstractValue implements AbstractValue { class WrappedAbstractValue implements AbstractValue {
final AbstractValue _abstractValue; final AbstractValue _abstractValue;

View file

@ -48,7 +48,7 @@ import '../native/behavior.dart';
import '../native/enqueue.dart'; import '../native/enqueue.dart';
import '../options.dart'; import '../options.dart';
import '../serialization/serialization.dart'; import '../serialization/serialization.dart';
import '../ssa/builder_kernel.dart'; import '../ssa/builder.dart';
import '../ssa/nodes.dart'; import '../ssa/nodes.dart';
import '../ssa/ssa.dart'; import '../ssa/ssa.dart';
import '../ssa/types.dart'; import '../ssa/types.dart';

View file

@ -8,7 +8,7 @@ import '../common.dart';
import '../inferrer/abstract_value_domain.dart'; import '../inferrer/abstract_value_domain.dart';
import '../io/source_information.dart'; import '../io/source_information.dart';
import 'builder_kernel.dart'; import 'builder.dart';
import 'locals_handler.dart'; import 'locals_handler.dart';
import 'nodes.dart'; import 'nodes.dart';

View file

@ -53,12 +53,12 @@ import '../universe/selector.dart';
import '../universe/target_checks.dart' show TargetChecks; import '../universe/target_checks.dart' show TargetChecks;
import '../universe/use.dart' show ConstantUse, StaticUse, TypeUse; import '../universe/use.dart' show ConstantUse, StaticUse, TypeUse;
import '../world.dart'; import '../world.dart';
import 'branch_builder.dart';
import 'jump_handler.dart'; import 'jump_handler.dart';
import 'kernel_string_builder.dart';
import 'locals_handler.dart'; import 'locals_handler.dart';
import 'loop_handler.dart'; import 'loop_handler.dart';
import 'nodes.dart'; import 'nodes.dart';
import 'ssa_branch_builder.dart'; import 'string_builder.dart';
import 'switch_continue_analysis.dart'; import 'switch_continue_analysis.dart';
import 'type_builder.dart'; import 'type_builder.dart';

View file

@ -9,7 +9,7 @@ import '../elements/jumps.dart';
import '../inferrer/abstract_value_domain.dart'; import '../inferrer/abstract_value_domain.dart';
import '../io/source_information.dart'; import '../io/source_information.dart';
import 'builder_kernel.dart'; import 'builder.dart';
import 'locals_handler.dart'; import 'locals_handler.dart';
import 'nodes.dart'; import 'nodes.dart';

View file

@ -19,7 +19,7 @@ import '../js_model/closure.dart' show JRecordField, JClosureField;
import '../js_model/locals.dart' show GlobalLocalsMap, JLocal; import '../js_model/locals.dart' show GlobalLocalsMap, JLocal;
import '../world.dart' show JClosedWorld; import '../world.dart' show JClosedWorld;
import 'builder_kernel.dart'; import 'builder.dart';
import 'nodes.dart'; import 'nodes.dart';
import 'types.dart'; import 'types.dart';

View file

@ -11,7 +11,7 @@ import '../elements/jumps.dart';
import '../inferrer/abstract_value_domain.dart'; import '../inferrer/abstract_value_domain.dart';
import '../io/source_information.dart'; import '../io/source_information.dart';
import 'builder_kernel.dart'; import 'builder.dart';
import 'jump_handler.dart'; import 'jump_handler.dart';
import 'locals_handler.dart'; import 'locals_handler.dart';
import 'nodes.dart'; import 'nodes.dart';

View file

@ -8,7 +8,7 @@ import 'package:kernel/ast.dart' as ir;
import '../common.dart'; import '../common.dart';
import '../inferrer/abstract_value_domain.dart'; import '../inferrer/abstract_value_domain.dart';
import 'builder_kernel.dart'; import 'builder.dart';
import 'nodes.dart'; import 'nodes.dart';
/// Visits and concatenates the expressions in a string concatenation. /// Visits and concatenates the expressions in a string concatenation.

View file

@ -4,7 +4,7 @@
// @dart = 2.10 // @dart = 2.10
import 'builder_kernel.dart'; import 'builder.dart';
import 'nodes.dart'; import 'nodes.dart';
import '../elements/entities.dart'; import '../elements/entities.dart';
import '../elements/types.dart'; import '../elements/types.dart';

View file

@ -11,7 +11,7 @@ import 'package:kernel/text/indentation.dart' show Indentation;
import '../compiler_api.dart' as api; import '../compiler_api.dart' as api;
import 'options.dart' show CompilerOptions; import 'options.dart' show CompilerOptions;
import 'ssa/nodes.dart' as ssa show HGraph; import 'ssa/nodes.dart' as ssa show HGraph;
import 'ssa/ssa_tracer.dart' show HTracer; import 'ssa/tracer.dart' show HTracer;
import 'world.dart' show JClosedWorld; import 'world.dart' show JClosedWorld;
String TRACE_FILTER_PATTERN_FOR_TEST; String TRACE_FILTER_PATTERN_FOR_TEST;

View file

@ -13,7 +13,7 @@ import 'package:compiler/src/elements/entities.dart';
import 'package:compiler/src/js_model/element_map.dart'; import 'package:compiler/src/js_model/element_map.dart';
import 'package:compiler/src/js_model/js_strategy.dart'; import 'package:compiler/src/js_model/js_strategy.dart';
import 'package:compiler/src/js_model/js_world.dart'; import 'package:compiler/src/js_model/js_world.dart';
import 'package:compiler/src/ssa/builder_kernel.dart'; import 'package:compiler/src/ssa/builder.dart';
import 'package:compiler/src/universe/world_impact.dart'; import 'package:compiler/src/universe/world_impact.dart';
import 'package:compiler/src/universe/use.dart'; import 'package:compiler/src/universe/use.dart';
import 'package:kernel/ast.dart' as ir; import 'package:kernel/ast.dart' as ir;