Fix expected type in substByContext

Note: the crash in language_2.status was added as a result of https://dart-review.googlesource.com/c/sdk/+/49835. Change-Id: I0dbd69a7cf80c6c432938f9bfd9df60703d5b367 Reviewed-on: https://dart-review.googlesource.com/50361 Reviewed-by: Stephen Adams <[email protected]> Commit-Queue: Sigmund Cherem <[email protected]>
aam · Apr 10, 2018 · f71d204 · f71d204
1 parent 5e99872
commit f71d204
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/pkg/compiler/lib/src/compile_time_constants.dart b/pkg/compiler/lib/src/compile_time_constants.dart
@@ -1470,7 +1470,7 @@ class AstEvaluationEnvironment extends EvaluationEnvironmentBase {
 
   @override
   ResolutionInterfaceType substByContext(
-      ResolutionInterfaceType base, ResolutionInterfaceType target) {
+      ResolutionDartType base, ResolutionInterfaceType target) {
     return base.substByContext(target);
   }
 

diff --git a/pkg/compiler/lib/src/constants/evaluation.dart b/pkg/compiler/lib/src/constants/evaluation.dart
@@ -40,7 +40,7 @@ abstract class EvaluationEnvironment {
   /// Performs the substitution of the type arguments of [target] for their
   /// corresponding type variables in [type].
   InterfaceType substByContext(
-      covariant InterfaceType base, covariant InterfaceType target);
+      covariant DartType base, covariant InterfaceType target);
 
   void reportWarning(
       ConstantExpression expression, MessageKind kind, Map arguments);

diff --git a/pkg/compiler/lib/src/kernel/element_map_impl.dart b/pkg/compiler/lib/src/kernel/element_map_impl.dart
@@ -1817,7 +1817,7 @@ class KernelEvaluationEnvironment extends EvaluationEnvironmentBase {
   DartTypes get types => _elementMap.types;
 
   @override
-  InterfaceType substByContext(InterfaceType base, InterfaceType target) {
+  InterfaceType substByContext(DartType base, InterfaceType target) {
     return _elementMap._substByContext(base, target);
   }
 

diff --git a/tests/language_2/language_2_dart2js.status b/tests/language_2/language_2_dart2js.status
@@ -1115,7 +1115,6 @@ compile_time_constant_static5_test/23: CompileTimeError
 conditional_rewrite_test: RuntimeError
 config_import_corelib_test: CompileTimeError
 config_import_test: RuntimeError
-const_cast3_test: Crash # type 'TypeVariableType' is not a subtype of type 'InterfaceType' of 'base' where
 const_dynamic_type_literal_test/02: MissingCompileTimeError
 const_evaluation_test/01: RuntimeError
 const_instance_field_test/01: MissingCompileTimeError