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

[dart2js] Don't encode types as their own superinterfaces.

Browse source 
Change-Id: I0c478a1d09985394610b6f76224e40b6f12467fd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112042
Reviewed-by: Stephen Adams <sra@google.com>
Commit-Queue: Mayank Patke <fishythefish@google.com>
This commit is contained in:
Mayank Patke 2019-08-06 22:12:58 +00:00 committed by commit-bot@chromium.org
parent f715515531
commit 78c3fc4595
2 changed files with 36 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -449,8 +449,12 @@ class _RecipeGenerator implements DartTypeVisitor<void, void> {
class _RulesetEntry {
final InterfaceType _targetType;
List<InterfaceType> _supertypes;
Map<TypeVariableType, DartType> _typeVariables = {};
_RulesetEntry(this._targetType, this._supertypes);
_RulesetEntry(this._targetType, Iterable<InterfaceType> supertypes)
: _supertypes = supertypes.toList();
bool get isEmpty => _supertypes.isEmpty && _typeVariables.isEmpty;
}
class Ruleset {
@ -483,13 +487,30 @@ class RulesetEncoder {
bool _isObject(InterfaceType type) => identical(type.element, _objectClass);
void _preprocessEntry(_RulesetEntry entry) =>
entry._supertypes.removeWhere(_isObject);
void _preprocessSupertype(_RulesetEntry entry, InterfaceType supertype) {
InterfaceType thisSupertype = _dartTypes.getThisType(supertype.element);
List<DartType> typeVariables = thisSupertype.typeArguments;
List<DartType> supertypeArguments = supertype.typeArguments;
int length = typeVariables.length;
assert(supertypeArguments.length == length);
for (int i = 0; i < length; i++) {
entry._typeVariables[typeVariables[i]] = supertypeArguments[i];
}
}
void _preprocessEntry(_RulesetEntry entry) {
entry._supertypes.removeWhere(_isObject);
entry._supertypes.forEach(
(InterfaceType supertype) => _preprocessSupertype(entry, supertype));
entry._supertypes.removeWhere(
(InterfaceType supertype) => identical(entry._targetType, supertype));
}
void _preprocessRuleset(Ruleset ruleset) {
ruleset._entries
.removeWhere((_RulesetEntry entry) => _isObject(entry._targetType));
ruleset._entries.forEach(_preprocessEntry);
ruleset._entries.removeWhere((_RulesetEntry entry) =>
_isObject(entry._targetType) || entry._supertypes.isEmpty);
ruleset._entries.removeWhere((_RulesetEntry entry) => entry.isEmpty);
}
// TODO(fishythefish): Common substring elimination.
@ -514,22 +535,17 @@ class RulesetEncoder {
js.quoteName(_emitter.typeAccessNewRti(entry._targetType.element)),
_colon,
_leftBrace,
...js.joinLiterals(
entry._supertypes.map((InterfaceType supertype) =>
_encodeSupertype(entry._targetType, supertype)),
_comma),
...js.joinLiterals([
...entry._supertypes.map((InterfaceType supertype) =>
_encodeSupertype(entry._targetType, supertype)),
...entry._typeVariables.entries.map((mapEntry) => _encodeTypeVariable(
entry._targetType, mapEntry.key, mapEntry.value))
], _comma),
_rightBrace,
]);
jsAst.StringConcatenation _encodeSupertype(
InterfaceType targetType, InterfaceType supertype) =>
js.concatenateStrings(js.joinLiterals([
_encodeSupertypeInterface(targetType, supertype),
..._encodeSupertypeTypeVariables(targetType, supertype),
], _comma));
jsAst.StringConcatenation _encodeSupertypeInterface(
InterfaceType targetType, InterfaceType supertype) =>
js.concatenateStrings([
js.quoteName(_emitter.typeAccessNewRti(supertype.element)),
_colon,
@ -541,29 +557,8 @@ class RulesetEncoder {
_rightBracket,
]);
List<jsAst.StringConcatenation> _encodeSupertypeTypeVariables(
InterfaceType targetType, InterfaceType supertype) {
InterfaceType thisSupertype = _dartTypes.getThisType(supertype.element);
List<DartType> typeVariables = thisSupertype.typeArguments;
List<DartType> supertypeArguments = supertype.typeArguments;
int length = typeVariables.length;
assert(supertypeArguments.length == length);
List<jsAst.StringConcatenation> result = List(length);
for (int i = 0; i < length; i++) {
DartType typeVariable = typeVariables[i];
assert(typeVariable.isTypeVariable);
typeVariable.forEachTypeVariable((TypeVariableType typeVariable) {
result[i] = _encodeSupertypeTypeVariable(
targetType, typeVariable, supertypeArguments[i]);
});
}
return result;
}
jsAst.StringConcatenation _encodeSupertypeTypeVariable(
InterfaceType targetType,
TypeVariableType typeVariable,
DartType supertypeArgument) =>
jsAst.StringConcatenation _encodeTypeVariable(InterfaceType targetType,
TypeVariableType typeVariable, DartType supertypeArgument) =>
js.concatenateStrings([
js.quoteName(_emitter.typeVariableAccessNewRti(typeVariable.element)),
_colon,

6
pkg/compiler/lib/src/js_emitter/startup_emitter/fragment_emitter.dart
View file

@ -1948,10 +1948,8 @@ class FragmentEmitter {
classes.forEach((Class cls) {
if (cls.classChecksNewRti == null) return;
InterfaceType targetType = _elementEnvironment.getThisType(cls.element);
List<InterfaceType> supertypes = cls.classChecksNewRti.checks
.map((TypeCheck check) =>
_dartTypes.asInstanceOf(targetType, check.cls))
.toList();
Iterable<InterfaceType> supertypes = cls.classChecksNewRti.checks.map(
(TypeCheck check) => _dartTypes.asInstanceOf(targetType, check.cls));
ruleset.add(targetType, supertypes);
});