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

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

Issue 940053002: dart2js: add function type to the model. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Addressed comments. Created 5 years, 10 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
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4891f82539d21174cd5ed519dc1bcb6444559fb6..2d22ead02315ee95bb458efb7d9fb5dbc76f3817 100644
--- a/pkg/compiler/lib/src/js_emitter/program_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/program_builder.dart
@@ -544,6 +544,11 @@ class ProgramBuilder {
memberType = element.type;
}
+ js.Expression functionType;
+ if (canTearOff || canBeReflected) {
+ functionType = _generateFunctionType(memberType);
+ }
+
int requiredParameterCount;
var /* List | Map */ optionalParameterDefaultValues;
if (canBeApplied || canBeReflected) {
@@ -554,12 +559,22 @@ class ProgramBuilder {
}
return new InstanceMethod(element, name, code,
- _generateParameterStubs(element, canTearOff), callName, memberType,
+ _generateParameterStubs(element, canTearOff), callName,
needsTearOff: canTearOff, tearOffName: tearOffName,
isClosure: isClosure, aliasName: aliasName,
canBeApplied: canBeApplied, canBeReflected: canBeReflected,
requiredParameterCount: requiredParameterCount,
- optionalParameterDefaultValues: optionalParameterDefaultValues);
+ optionalParameterDefaultValues: optionalParameterDefaultValues,
+ functionType: functionType);
+ }
+
+ js.Expression _generateFunctionType(DartType type) {
+ 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));
+ }
}
List<ParameterStubMethod> _generateParameterStubs(FunctionElement element,
@@ -692,12 +707,18 @@ class ProgramBuilder {
String tearOffName =
needsTearOff ? namer.getStaticClosureName(element) : null;
+
String callName = null;
if (needsTearOff) {
Selector callSelector =
new Selector.fromElement(element).toCallSelector();
callName = namer.invocationName(callSelector);
}
+ js.Expression functionType;
+ DartType type = element.type;
+ if (needsTearOff || canBeReflected) {
+ functionType = _generateFunctionType(type);
+ }
int requiredParameterCount;
var /* List | Map */ optionalParameterDefaultValues;
@@ -713,14 +734,15 @@ class ProgramBuilder {
return new StaticDartMethod(element,
name, _registry.registerHolder(holder), code,
_generateParameterStubs(element, needsTearOff),
- callName, element.type,
+ callName,
needsTearOff: needsTearOff,
tearOffName: tearOffName,
canBeApplied: canBeApplied,
canBeReflected: canBeReflected,
requiredParameterCount: requiredParameterCount,
optionalParameterDefaultValues:
- optionalParameterDefaultValues);
+ optionalParameterDefaultValues,
+ functionType: functionType);
}
void _registerConstants(OutputUnit outputUnit,
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/old_emitter/container_builder.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698