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

Unified Diff: pkg/compiler/lib/src/elements/modelx.dart

Issue 1019923005: Dart2js deferred loading. Follow types of functions when calculating dependencies. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Added test for generic type 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/elements/modelx.dart
diff --git a/pkg/compiler/lib/src/elements/modelx.dart b/pkg/compiler/lib/src/elements/modelx.dart
index a8cea0a830b7cfa770d0d37477c68570c4e9d132..5ae07ffaace186de50c9b0a50544f2d7db5fbb5c 100644
--- a/pkg/compiler/lib/src/elements/modelx.dart
+++ b/pkg/compiler/lib/src/elements/modelx.dart
@@ -2054,17 +2054,24 @@ class SynthesizedConstructorElementX extends ConstructorElementX {
final ConstructorElement definingConstructor;
final bool isDefaultConstructor;
- SynthesizedConstructorElementX(String name,
- this.definingConstructor,
- Element enclosing,
- this.isDefaultConstructor)
- : super(name,
+ SynthesizedConstructorElementX.notForDefault(String name,
+ this.definingConstructor,
+ Element enclosing)
+ : isDefaultConstructor = false,
+ super(name,
ElementKind.GENERATIVE_CONSTRUCTOR,
Modifiers.EMPTY,
- enclosing);
+ enclosing) ;
- SynthesizedConstructorElementX.forDefault(superMember, Element enclosing)
- : this('', superMember, enclosing, true);
+ SynthesizedConstructorElementX.forDefault(this.definingConstructor,
+ Element enclosing)
+ : isDefaultConstructor = true,
+ super('',
+ ElementKind.GENERATIVE_CONSTRUCTOR,
+ Modifiers.EMPTY,
+ enclosing) {
+ typeCache = new FunctionType.synthesized(enclosingClass.thisType);
+ }
FunctionExpression parseNode(DiagnosticListener listener) => null;
@@ -2076,11 +2083,21 @@ class SynthesizedConstructorElementX extends ConstructorElementX {
bool get isSynthesized => true;
+ DartType get type {
+ if (isDefaultConstructor) {
+ return super.type;
+ } else {
+ // TODO(johnniwinther): Ensure that the function type substitutes type
+ // variables correctly.
+ return definingConstructor.type;
+ }
+ }
+
FunctionSignature computeSignature(compiler) {
if (functionSignatureCache != null) return functionSignatureCache;
if (isDefaultConstructor) {
return functionSignatureCache = new FunctionSignatureX(
- type: new FunctionType(this, enclosingClass.thisType));
+ type: type);
}
if (definingConstructor.isErroneous) {
return functionSignatureCache =
« no previous file with comments | « pkg/compiler/lib/src/deferred_load.dart ('k') | pkg/compiler/lib/src/js_backend/custom_elements_analysis.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698