Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Unified Diff: pkg/compiler/lib/src/js_emitter/metadata_collector.dart

Issue 2603263002: Prefix resolution_types with Resolution. (Closed)
Patch Set: Rebased Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/js_emitter/metadata_collector.dart
diff --git a/pkg/compiler/lib/src/js_emitter/metadata_collector.dart b/pkg/compiler/lib/src/js_emitter/metadata_collector.dart
index 94b014a447efa5420109f515c0f62031d7456f0a..d625e44ba9632505205b62e2a9bfcb491d798514 100644
--- a/pkg/compiler/lib/src/js_emitter/metadata_collector.dart
+++ b/pkg/compiler/lib/src/js_emitter/metadata_collector.dart
@@ -130,8 +130,8 @@ class MetadataCollector implements jsAst.TokenFinalizer {
}
/// A map used to canonicalize the entries of types.
- Map<OutputUnit, Map<DartType, _BoundMetadataEntry>> _typesMap =
- <OutputUnit, Map<DartType, _BoundMetadataEntry>>{};
+ Map<OutputUnit, Map<ResolutionDartType, _BoundMetadataEntry>> _typesMap =
+ <OutputUnit, Map<ResolutionDartType, _BoundMetadataEntry>>{};
// To support incremental compilation, we have to be able to eagerly emit
// metadata and add metadata later on. We use the below two counters for
@@ -266,13 +266,15 @@ class MetadataCollector implements jsAst.TokenFinalizer {
return _addGlobalMetadata(_emitter.constantReference(constant));
}
- jsAst.Expression reifyType(DartType type, {ignoreTypeVariables: false}) {
+ jsAst.Expression reifyType(ResolutionDartType type,
+ {ignoreTypeVariables: false}) {
return reifyTypeForOutputUnit(
type, _compiler.deferredLoadTask.mainOutputUnit,
ignoreTypeVariables: ignoreTypeVariables);
}
- jsAst.Expression reifyTypeForOutputUnit(DartType type, OutputUnit outputUnit,
+ jsAst.Expression reifyTypeForOutputUnit(
+ ResolutionDartType type, OutputUnit outputUnit,
{ignoreTypeVariables: false}) {
return addTypeInOutputUnit(type, outputUnit,
ignoreTypeVariables: ignoreTypeVariables);
@@ -303,13 +305,13 @@ class MetadataCollector implements jsAst.TokenFinalizer {
});
}
- jsAst.Expression _computeTypeRepresentation(DartType type,
+ jsAst.Expression _computeTypeRepresentation(ResolutionDartType type,
{ignoreTypeVariables: false}) {
jsAst.Expression representation =
_backend.rtiEncoder.getTypeRepresentation(type, (variable) {
if (ignoreTypeVariables) return new jsAst.LiteralNull();
return _typeVariableHandler.reifyTypeVariable(variable.element);
- }, (TypedefType typedef) {
+ }, (ResolutionTypedefType typedef) {
return _backend.isAccessibleByReflection(typedef.element);
});
@@ -323,10 +325,12 @@ class MetadataCollector implements jsAst.TokenFinalizer {
return representation;
}
- jsAst.Expression addTypeInOutputUnit(DartType type, OutputUnit outputUnit,
+ jsAst.Expression addTypeInOutputUnit(
+ ResolutionDartType type, OutputUnit outputUnit,
{ignoreTypeVariables: false}) {
if (_typesMap[outputUnit] == null) {
- _typesMap[outputUnit] = new Map<DartType, _BoundMetadataEntry>();
+ _typesMap[outputUnit] =
+ new Map<ResolutionDartType, _BoundMetadataEntry>();
}
return _typesMap[outputUnit].putIfAbsent(type, () {
_BoundMetadataEntry result = new _BoundMetadataEntry(
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/js_emitter.dart ('k') | pkg/compiler/lib/src/js_emitter/native_emitter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698