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

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

Issue 1071133002: dart2js: create a 'types' table for each deferred unit. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Rebased and updated comment. Created 5 years, 8 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/program_builder.dart
diff --git a/pkg/compiler/lib/src/js_emitter/program_builder.dart b/pkg/compiler/lib/src/js_emitter/program_builder.dart
index b2cb77f6ca656567e6c12a931d89fc4cd8b75fdb..0b901412ee4ef0eb11f20b8a15237cb5429b5103 100644
--- a/pkg/compiler/lib/src/js_emitter/program_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/program_builder.dart
@@ -547,7 +547,9 @@ class ProgramBuilder {
js.Expression functionType;
if (canTearOff || canBeReflected) {
- functionType = _generateFunctionType(memberType);
+ OutputUnit outputUnit =
+ _compiler.deferredLoadTask.outputUnitForElement(element);
+ functionType = _generateFunctionType(memberType, outputUnit);
}
int requiredParameterCount;
@@ -569,12 +571,13 @@ class ProgramBuilder {
functionType: functionType);
}
- js.Expression _generateFunctionType(DartType type) {
+ js.Expression _generateFunctionType(DartType type, OutputUnit outputUnit) {
if (type.containsTypeVariables) {
js.Expression thisAccess = js.js(r'this.$receiver');
return backend.rti.getSignatureEncoding(type, thisAccess);
} else {
- return js.number(backend.emitter.metadataCollector.reifyType(type));
+ return js.number(backend.emitter.metadataCollector.
+ reifyTypeForOutputUnit(type, outputUnit));
}
}
@@ -718,7 +721,9 @@ class ProgramBuilder {
js.Expression functionType;
DartType type = element.type;
if (needsTearOff || canBeReflected) {
- functionType = _generateFunctionType(type);
+ OutputUnit outputUnit =
+ _compiler.deferredLoadTask.outputUnitForElement(element);
+ functionType = _generateFunctionType(type, outputUnit);
}
int requiredParameterCount;

Powered by Google App Engine
This is Rietveld 408576698