[dart2js] Remove references to new-rti/old-rti.

The "new" rti library has been standard for years now and no one should
be passing `--experiment-new-rti` or `--use-old-rti`. We can now clean
up any references to different versions of rtis.

Change-Id: I4421b8943fe5034ed4d259477e8112b25ba0c763
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416326
Reviewed-by: Nate Biggs <[email protected]>
Commit-Queue: Mayank Patke <[email protected]>

Author: fishythefish

CHANGELOG.md

@@ -77,6 +77,10 @@ not match the non-nullable type and this will now throw.
 In the future this will likely be a compile-time error and will be entirely
 disallowed.
 
+#### Dart to Javascript Compiler (dart2js)
+
+Removed the `--experiment-new-rti` and `--use-old-rti` flags.
+
 ## 3.7.0
 
 **Released on:** 2025-02-12

benchmarks/SoundSplayTreeSieve/dart/README.md

@@ -15,17 +15,17 @@ CollectionSieves-SoundSplayTreeSet-removeLoop(RunTime): 4344.902386117137 us.
 
 **Dart2JS**
 ```
-$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --experiment-new-rti --out=soundsplay_d2js.js
+$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --out=soundsplay_d2js.js
 $ third_party/d8/linux/d8 soundsplay_d2js.js
 ```
 
 **Dart2JS (Omit implicit checks)**
 ```
-$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --experiment-new-rti --omit-implicit-checks --out=soundsplay_d2js_omit.js --lax-runtime-type-to-string
+$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --omit-implicit-checks --out=soundsplay_d2js_omit.js --lax-runtime-type-to-string
 $ third_party/d8/linux/d8 soundsplay_d2js_omit.js
 ```
 
 **DDK**
 ```
 $ pkg/dev_compiler/tool/ddb -d -r chrome --enable-experiment=variance -k benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart
-```
+```

benchmarks/SoundSplayTreeSieve/dart2/README.md

@@ -15,17 +15,17 @@ CollectionSieves-SoundSplayTreeSet-removeLoop(RunTime): 4344.902386117137 us.
 
 **Dart2JS**
 ```
-$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --experiment-new-rti --out=soundsplay_d2js.js
+$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --out=soundsplay_d2js.js
 $ third_party/d8/linux/d8 soundsplay_d2js.js
 ```
 
 **Dart2JS (Omit implicit checks)**
 ```
-$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --experiment-new-rti --omit-implicit-checks --out=soundsplay_d2js_omit.js --lax-runtime-type-to-string
+$ sdk/bin/dart2js_developer benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart --enable-experiment=variance --omit-implicit-checks --out=soundsplay_d2js_omit.js --lax-runtime-type-to-string
 $ third_party/d8/linux/d8 soundsplay_d2js_omit.js
 ```
 
 **DDK**
 ```
 $ pkg/dev_compiler/tool/ddb -d -r chrome --enable-experiment=variance -k benchmarks/SoundSplayTreeSieve/dart/SoundSplayTreeSieve.dart
-```
+```

pkg/compiler/lib/src/commandline_options.dart

@@ -58,8 +58,6 @@ class Flags {
   static const String experimentCallInstrumentation =
       '--experiment-call-instrumentation';
 
-  static const String experimentNewRti = '--experiment-new-rti';
-
   static const String enableLanguageExperiments = '--enable-experiment';
 
   static const String fastStartup = '--fast-startup';
@@ -107,7 +105,6 @@ class Flags {
       '--experimental-trust-js-interop-type-annotations';
   static const String useMultiSourceInfo = '--use-multi-source-info';
   static const String useNewSourceInfo = '--use-new-source-info';
-  static const String useOldRti = '--use-old-rti';
   static const String useSimpleLoadIds = '--simple-load-ids';
   static const String verbose = '--verbose';
   static const String verbosity = '--verbosity';

pkg/compiler/lib/src/common/elements.dart

@@ -1109,7 +1109,7 @@ abstract class CommonElements {
   FunctionEntity get specializedAsStringNullable =>
       _findRtiFunction('_asStringQ');
 
-  FunctionEntity get instantiatedGenericFunctionTypeNewRti =>
+  FunctionEntity get instantiatedGenericFunctionType =>
       _findRtiFunction('instantiatedGenericFunctionType');
 
   FunctionEntity get closureFunctionType =>

pkg/compiler/lib/src/dart2js.dart

@@ -531,7 +531,6 @@ Future<api.CompilationResult> compile(
     _OneOption(Flags.generateCodeWithCompileTimeErrors, ignoreOption),
     _OneOption(Flags.useMultiSourceInfo, passThrough),
     _OneOption(Flags.useNewSourceInfo, passThrough),
-    _OneOption(Flags.useOldRti, passThrough),
     _OneOption(Flags.useSimpleLoadIds, passThrough),
     _OneOption(Flags.testMode, passThrough),
     _OneOption('${Flags.dumpSsa}=.+', passThrough),
@@ -552,7 +551,6 @@ Future<api.CompilationResult> compile(
     _OneOption(Flags.experimentToBoolean, passThrough),
     _OneOption(Flags.experimentUnreachableMethodsThrow, passThrough),
     _OneOption(Flags.experimentCallInstrumentation, passThrough),
-    _OneOption(Flags.experimentNewRti, ignoreOption),
     _OneOption('${Flags.mergeFragmentsThreshold}=.+', passThrough),
 
     // Wire up feature flags.

pkg/compiler/lib/src/deferred_load/entity_data_info.dart

@@ -237,7 +237,7 @@ class EntityDataInfoBuilder {
         break;
       case TypeUseKind.rtiValue:
       case TypeUseKind.typeArgument:
-      case TypeUseKind.namedTypeVariableNewRti:
+      case TypeUseKind.namedTypeVariable:
       case TypeUseKind.constructorReference:
         failedAt(parent!, "Unexpected type use: $typeUse.");
     }

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

@@ -98,7 +98,7 @@ class BackendImpacts {
 
   late final BackendImpact getRuntimeTypeArgument = BackendImpact(
     globalUses: [],
-    otherImpacts: [newRtiImpact],
+    otherImpacts: [rtiImpact],
   );
 
   late final BackendImpact computeSignature = BackendImpact(
@@ -153,7 +153,7 @@ class BackendImpacts {
 
   late final BackendImpact asCheck = BackendImpact(
     staticUses: [],
-    otherImpacts: [newRtiImpact],
+    otherImpacts: [rtiImpact],
   );
 
   late final BackendImpact stringValues = BackendImpact(
@@ -322,34 +322,34 @@ class BackendImpacts {
   );
 
   late final BackendImpact typeCheck = BackendImpact(
-    otherImpacts: [boolValues, newRtiImpact],
+    otherImpacts: [boolValues, rtiImpact],
   );
 
   late final BackendImpact genericTypeCheck = BackendImpact(
     staticUses: [
       // TODO(johnniwinther): Investigate why this is needed.
       _commonElements.setArrayType,
     ],
-    otherImpacts: [listValues, getRuntimeTypeArgument, newRtiImpact],
+    otherImpacts: [listValues, getRuntimeTypeArgument, rtiImpact],
   );
 
   late final BackendImpact genericIsCheck = BackendImpact(
-    otherImpacts: [intValues, newRtiImpact],
+    otherImpacts: [intValues, rtiImpact],
   );
 
   late final BackendImpact typeVariableTypeCheck = BackendImpact(
     staticUses: [],
-    otherImpacts: [newRtiImpact],
+    otherImpacts: [rtiImpact],
   );
 
   late final BackendImpact functionTypeCheck = BackendImpact(
     staticUses: [/*helpers.functionTypeTestMetaHelper*/],
-    otherImpacts: [newRtiImpact],
+    otherImpacts: [rtiImpact],
   );
 
   late final BackendImpact futureOrTypeCheck = BackendImpact(
     staticUses: [],
-    otherImpacts: [newRtiImpact],
+    otherImpacts: [rtiImpact],
   );
 
   late final BackendImpact nativeTypeCheck = BackendImpact(
@@ -359,7 +359,7 @@ class BackendImpacts {
       // [:defineProperty:] is compiled.
       _commonElements.defineProperty,
     ],
-    otherImpacts: [newRtiImpact],
+    otherImpacts: [rtiImpact],
   );
 
   late final BackendImpact closure = BackendImpact(
@@ -532,7 +532,7 @@ class BackendImpacts {
       _genericInstantiation[typeArgumentCount] ??= BackendImpact(
         staticUses: [
           _commonElements.getInstantiateFunction(typeArgumentCount),
-          _commonElements.instantiatedGenericFunctionTypeNewRti,
+          _commonElements.instantiatedGenericFunctionType,
           _commonElements.closureFunctionType,
         ],
         instantiatedClasses: [
@@ -541,7 +541,7 @@ class BackendImpacts {
       );
 
   // TODO(sra): Split into refined impacts.
-  late final BackendImpact newRtiImpact = BackendImpact(
+  late final BackendImpact rtiImpact = BackendImpact(
     staticUses: [
       if (_options.interopNullAssertions) _commonElements.interopNullAssertion,
       _commonElements.findType,

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

@@ -45,7 +45,7 @@ class CodegenEnqueuerListener extends EnqueuerListener {
   final CodegenWorldBuilder _worldBuilder;
 
   bool _isNoSuchMethodUsed = false;
-  bool _isNewRtiUsed = false;
+  bool _isRtiUsed = false;
 
   CodegenEnqueuerListener(
     this._options,
@@ -149,30 +149,30 @@ class CodegenEnqueuerListener extends EnqueuerListener {
     }
 
     // TODO(fishythefish): Avoid registering unnecessary impacts.
-    if (!_isNewRtiUsed) {
-      WorldImpactBuilderImpl newRtiImpact = WorldImpactBuilderImpl();
-      newRtiImpact.registerStaticUse(
+    if (!_isRtiUsed) {
+      WorldImpactBuilderImpl rtiImpact = WorldImpactBuilderImpl();
+      rtiImpact.registerStaticUse(
         StaticUse.staticInvoke(
           _commonElements.rtiAddRulesMethod,
           CallStructure.twoArgs,
         ),
       );
-      newRtiImpact.registerStaticUse(
+      rtiImpact.registerStaticUse(
         StaticUse.staticInvoke(
           _commonElements.rtiAddErasedTypesMethod,
           CallStructure.twoArgs,
         ),
       );
       if (_options.enableVariance) {
-        newRtiImpact.registerStaticUse(
+        rtiImpact.registerStaticUse(
           StaticUse.staticInvoke(
             _commonElements.rtiAddTypeParameterVariancesMethod,
             CallStructure.twoArgs,
           ),
         );
       }
-      enqueuer.applyImpact(newRtiImpact);
-      _isNewRtiUsed = true;
+      enqueuer.applyImpact(rtiImpact);
+      _isRtiUsed = true;
     }
 
     if (_nativeData.isAllowInteropUsed) {
@@ -257,7 +257,7 @@ class CodegenEnqueuerListener extends EnqueuerListener {
 
       impactBuilder.registerStaticUse(
         StaticUse.staticInvoke(
-          _commonElements.instantiatedGenericFunctionTypeNewRti,
+          _commonElements.instantiatedGenericFunctionType,
           CallStructure.twoArgs,
         ),
       );

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

@@ -273,7 +273,7 @@ class ConstantEmitter extends ModularConstantEmitter {
         .toList(growable: false);
     js_ast.ArrayInitializer array = js_ast.ArrayInitializer(elements);
     js_ast.Expression value = _makeConstantList(array);
-    return maybeAddListTypeArgumentsNewRti(constant, constant.type, value);
+    return maybeAddListTypeArguments(constant, constant.type, value);
   }
 
   @override
@@ -296,7 +296,7 @@ class ConstantEmitter extends ModularConstantEmitter {
         _constantReferenceGenerator(constant.indexObject!),
         js.number(constant.length),
         if (_rtiNeed.classNeedsTypeArguments(classElement))
-          _reifiedTypeNewRti(sourceType),
+          _reifiedType(sourceType),
       ];
       js_ast.Expression constructor = _emitter.constructorAccess(classElement);
       return js_ast.New(constructor, arguments);
@@ -313,7 +313,7 @@ class ConstantEmitter extends ModularConstantEmitter {
             _constantReferenceGenerator(value),
         ]),
         if (_rtiNeed.classNeedsTypeArguments(classElement))
-          _reifiedTypeNewRti(sourceType),
+          _reifiedType(sourceType),
       ];
       js_ast.Expression constructor = _emitter.constructorAccess(classElement);
       return js_ast.New(constructor, arguments);
@@ -412,7 +412,7 @@ class ConstantEmitter extends ModularConstantEmitter {
     }
 
     if (_rtiNeed.classNeedsTypeArguments(classElement)) {
-      arguments.add(_reifiedTypeNewRti(constant.type));
+      arguments.add(_reifiedType(constant.type));
     }
 
     js_ast.Expression constructor = _emitter.constructorAccess(classElement);
@@ -491,7 +491,7 @@ class ConstantEmitter extends ModularConstantEmitter {
       }
     });
     if (_rtiNeed.classNeedsTypeArguments(constant.type.element)) {
-      fields.add(_reifiedTypeNewRti(constant.type));
+      fields.add(_reifiedType(constant.type));
     }
     return js_ast.New(constructor, fields);
   }
@@ -527,7 +527,7 @@ class ConstantEmitter extends ModularConstantEmitter {
       _constantReferenceGenerator(constant.function),
     ];
     fields.add(
-      _reifiedTypeNewRti(
+      _reifiedType(
         _commonElements.dartTypes.interfaceType(cls, constant.typeArguments),
       ),
     );
@@ -539,7 +539,7 @@ class ConstantEmitter extends ModularConstantEmitter {
     return rawJavaScript.replaceAll(commentRE, '');
   }
 
-  js_ast.Expression maybeAddListTypeArgumentsNewRti(
+  js_ast.Expression maybeAddListTypeArguments(
     ConstantValue constant,
     InterfaceType type,
     js_ast.Expression value,
@@ -548,13 +548,13 @@ class ConstantEmitter extends ModularConstantEmitter {
     if (_rtiNeed.classNeedsTypeArguments(type.element)) {
       return js_ast.Call(getHelperProperty(_commonElements.setArrayType), [
         value,
-        _reifiedTypeNewRti(type),
+        _reifiedType(type),
       ]);
     }
     return value;
   }
 
-  js_ast.Expression _reifiedTypeNewRti(DartType type) {
+  js_ast.Expression _reifiedType(DartType type) {
     assert(!type.containsTypeVariables);
     return TypeReference(TypeExpressionRecipe(type))..forConstant = true;
   }