[dart2js] Use runtime_types_new_interfaces in a few more places
Change-Id: Ie7480f67b96e63e609a3090aba4eac7f07a057a9
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/265964
Reviewed-by: Mayank Patke <fishythefish@google.com>
diff --git a/pkg/compiler/lib/src/js_backend/constant_emitter.dart b/pkg/compiler/lib/src/js_backend/constant_emitter.dart
index 4046f7e..9940e04 100644
--- a/pkg/compiler/lib/src/js_backend/constant_emitter.dart
+++ b/pkg/compiler/lib/src/js_backend/constant_emitter.dart
@@ -20,7 +20,7 @@
import '../js_model/type_recipe.dart' show TypeExpressionRecipe;
import '../options.dart';
import 'namer.dart';
-import 'runtime_types_new.dart' show RecipeEncoder;
+import 'runtime_types_new_interfaces.dart' show RecipeEncoder;
import 'runtime_types_resolution.dart';
typedef _ConstantReferenceGenerator = jsAst.Expression Function(
diff --git a/pkg/compiler/lib/src/js_backend/type_reference.dart b/pkg/compiler/lib/src/js_backend/type_reference.dart
index be8603e..399ae94 100644
--- a/pkg/compiler/lib/src/js_backend/type_reference.dart
+++ b/pkg/compiler/lib/src/js_backend/type_reference.dart
@@ -80,7 +80,7 @@
import '../util/util.dart' show Hashing;
import 'frequency_assignment.dart';
import 'namer.dart';
-import 'runtime_types_new.dart' show RecipeEncoder;
+import 'runtime_types_new_interfaces.dart' show RecipeEncoder;
/// Run the minifier for 'type$' property names even in non-minified mode,
/// making a name from minified name and the readable name. Usage:
diff --git a/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart b/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
index 4b65322..8de048c 100644
--- a/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
@@ -26,8 +26,8 @@
import '../../js_backend/native_data.dart';
import '../../js_backend/runtime_types.dart' show RuntimeTypesChecks;
import '../../js_backend/runtime_types_codegen.dart' show TypeCheck;
-import '../../js_backend/runtime_types_new.dart'
- show RecipeEncoder, RecipeEncoding;
+import '../../js_backend/runtime_types_new_interfaces.dart' show RecipeEncoder;
+import '../../js_backend/runtime_types_new_migrated.dart' show RecipeEncoding;
import '../../js_backend/runtime_types_new.dart' as newRti;
import '../../js_backend/runtime_types_resolution.dart' show RuntimeTypesNeed;
import '../../js_model/elements.dart' show JGeneratorBody, JSignatureMethod;
diff --git a/pkg/compiler/lib/src/js_emitter/startup_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/startup_emitter/emitter.dart
index 0f2ad9b..de98904 100644
--- a/pkg/compiler/lib/src/js_emitter/startup_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/startup_emitter/emitter.dart
@@ -17,7 +17,7 @@
import '../../js/js.dart' as js;
import '../../js_backend/constant_emitter.dart';
import '../../js_backend/namer.dart';
-import '../../js_backend/runtime_types_new.dart' show RecipeEncoder;
+import '../../js_backend/runtime_types_new_interfaces.dart' show RecipeEncoder;
import '../../options.dart';
import '../../universe/codegen_world_builder.dart' show CodegenWorld;
import '../../world.dart' show JClosedWorld;
diff --git a/pkg/compiler/lib/src/js_emitter/startup_emitter/model_emitter.dart b/pkg/compiler/lib/src/js_emitter/startup_emitter/model_emitter.dart
index 254b4c7..e674428 100644
--- a/pkg/compiler/lib/src/js_emitter/startup_emitter/model_emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/startup_emitter/model_emitter.dart
@@ -59,8 +59,9 @@
import '../../js_backend/js_interop_analysis.dart' as jsInteropAnalysis;
import '../../js_backend/runtime_types.dart';
import '../../js_backend/runtime_types_codegen.dart';
+import '../../js_backend/runtime_types_new_interfaces.dart' show RecipeEncoder;
import '../../js_backend/runtime_types_new.dart'
- show RecipeEncoder, RecipeEncoderImpl, Ruleset, RulesetEncoder;
+ show RecipeEncoderImpl, Ruleset, RulesetEncoder;
import '../../js_backend/runtime_types_resolution.dart' show RuntimeTypesNeed;
import '../../js_backend/deferred_holder_expression.dart'
show
diff --git a/pkg/compiler/lib/src/js_model/js_strategy.dart b/pkg/compiler/lib/src/js_model/js_strategy.dart
index d315fee..aba7432 100644
--- a/pkg/compiler/lib/src/js_model/js_strategy.dart
+++ b/pkg/compiler/lib/src/js_model/js_strategy.dart
@@ -42,8 +42,8 @@
import '../js_backend/namer_migrated.dart';
import '../js_backend/runtime_types.dart';
import '../js_backend/runtime_types_codegen.dart';
-import '../js_backend/runtime_types_new.dart'
- show RecipeEncoder, RecipeEncoderImpl;
+import '../js_backend/runtime_types_new_interfaces.dart' show RecipeEncoder;
+import '../js_backend/runtime_types_new.dart' show RecipeEncoderImpl;
import '../js_emitter/code_emitter_task.dart' show ModularEmitter;
import '../js_emitter/js_emitter.dart' show CodeEmitterTask;
import '../js/js.dart' as js;
