sdk/lib/_internal/compiler/implementation/elements/modelx.dart - Issue 111283006: Revert "Compute correct constructor type for synthesized mixin constructors."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/compiler/implementation/elements/modelx.dart

Issue 111283006: Revert "Compute correct constructor type for synthesized mixin constructors." (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 12 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 | « sdk/lib/_internal/compiler/implementation/dart_types.dart ('k') | sdk/lib/_internal/compiler/implementation/resolution/members.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/compiler/implementation/elements/modelx.dart

diff --git a/sdk/lib/_internal/compiler/implementation/elements/modelx.dart b/sdk/lib/_internal/compiler/implementation/elements/modelx.dart

index 78ad54785fa817a1fac5976c754e95d177c1b5c0..f72260c2246ddbec83d45be85d1f4bfe470ec8f5 100644

--- a/sdk/lib/_internal/compiler/implementation/elements/modelx.dart

+++ b/sdk/lib/_internal/compiler/implementation/elements/modelx.dart

@@ -1518,7 +1518,8 @@ class FunctionElementX extends ElementX implements FunctionElement {

assert(invariant(this, redirectionTargetType != null,

message: 'Redirection target type has not yet been computed for '

'$this.'));

- return redirectionTargetType.substByContext(newType);

+ return redirectionTargetType.subst(newType.typeArguments,

+ newType.element.typeVariables);

}

/**

@@ -1670,8 +1671,6 @@ class SynthesizedConstructorElementX extends FunctionElementX {

return functionSignature = compiler.objectClass.localLookup('')

.computeSignature(compiler);

}

- // TODO(johnniwinther): Ensure that the function signature (and with it the

- // function type) substitutes type variables correctly.

return functionSignature = superMember.computeSignature(compiler);

}