languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 11:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dart2js] Encode type variable as index in type rules when the target type declares the type variable.

Browse source 
Change-Id: Ie99ac30c04867336e03d32e9933c6b073d84ea8e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112038
Reviewed-by: Stephen Adams <sra@google.com>
This commit is contained in:
Mayank Patke 2019-08-06 22:12:58 +00:00 committed by commit-bot@chromium.org
parent 6103ecd6f1
commit f715515531
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
pkg/compiler/lib/src/js_backend/runtime_types_new.dart
View file

@ -36,6 +36,13 @@ abstract class RecipeEncoder {
jsAst.Literal encodeRecipeWithVariablesReplaceByAny(
ModularEmitter emitter, DartType dartType);
/// Returns a [jsAst.Literal] representing [supertypeArgument] to be evaluated
/// against a [FullTypeEnvironmentStructure] representing [declaringType]. Any
/// [TypeVariableType]s appearing in [supertypeArgument] which are declared by
/// [declaringType] are always encoded as indices.
jsAst.Literal encodeDirectSupertypeRecipe(ModularEmitter emitter,
InterfaceType declaringType, DartType supertypeArgument);
/// Converts a recipe into a fragment of code that accesses the evaluated
/// recipe.
// TODO(33422): Remove need for this by pushing stubs through SSA.
@ -78,6 +85,18 @@ class RecipeEncoderImpl implements RecipeEncoder {
.run();
}
@override
jsAst.Literal encodeDirectSupertypeRecipe(ModularEmitter emitter,
InterfaceType declaringType, DartType supertypeArgument) {
return _RecipeGenerator(
this,
emitter,
FullTypeEnvironmentStructure(classType: declaringType),
TypeExpressionRecipe(supertypeArgument),
indexTypeVariablesOnDeclaringClass: true)
.run();
}
@override
jsAst.Expression evaluateRecipe(
ModularEmitter emitter, jsAst.Literal recipe) {
@ -102,6 +121,7 @@ class _RecipeGenerator implements DartTypeVisitor<void, void> {
final ModularEmitter _emitter;
final TypeEnvironmentStructure _environment;
final TypeRecipe _recipe;
final bool indexTypeVariablesOnDeclaringClass;
final bool hackTypeVariablesToAny;
final List<FunctionTypeVariable> functionTypeVariables = [];
@ -112,7 +132,8 @@ class _RecipeGenerator implements DartTypeVisitor<void, void> {
_RecipeGenerator(
this._encoder, this._emitter, this._environment, this._recipe,
{this.hackTypeVariablesToAny = false});
{this.indexTypeVariablesOnDeclaringClass = false,
this.hackTypeVariablesToAny = false});
JClosedWorld get _closedWorld => _encoder._closedWorld;
NativeBasicData get _nativeData => _encoder._nativeData;
@ -251,6 +272,15 @@ class _RecipeGenerator implements DartTypeVisitor<void, void> {
TypeVariableEntity element = variable.element;
ClassEntity cls = element.typeDeclaration;
if (indexTypeVariablesOnDeclaringClass) {
TypeEnvironmentStructure environment = _environment;
if (environment is FullTypeEnvironmentStructure) {
if (identical(environment.classType.element, cls)) {
return element.index;
}
}
}
// TODO(sra): We might be in a context where the class type variable has an
// index, even though in the general case it is not at a specific index.
@ -541,10 +571,7 @@ class RulesetEncoder {
]);
jsAst.Literal _encodeSupertypeArgument(
InterfaceType targetType, DartType supertypeArgument) {
TypeEnvironmentStructure environment =
FullTypeEnvironmentStructure(classType: targetType);
TypeRecipe recipe = TypeExpressionRecipe(supertypeArgument);
return _recipeEncoder.encodeRecipe(_emitter, environment, recipe);
}
InterfaceType targetType, DartType supertypeArgument) =>
_recipeEncoder.encodeDirectSupertypeRecipe(
_emitter, targetType, supertypeArgument);
}