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

Unified Diff: lib/compiler/implementation/ssa/builder.dart

Issue 10910098: Re-apply with a few fixes http://codereview.chromium.org/10913081/: Fix resolution of type paramete… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 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: lib/compiler/implementation/ssa/builder.dart
===================================================================
--- lib/compiler/implementation/ssa/builder.dart (revision 11962)
+++ lib/compiler/implementation/ssa/builder.dart (working copy)
@@ -2554,12 +2554,17 @@
HInstruction analyzeTypeArgument(DartType argument, Node currentNode) {
if (argument.element.isTypeVariable()) {
- if (work.element.isFactoryConstructor()
- || work.element.isGenerativeConstructor()) {
+ Element member = work.element;
+ if (member.enclosingElement.isClosure()) {
+ member = (member.enclosingElement as ClosureClassElement).methodElement;
+ member = member.getOutermostEnclosingMemberOrTopLevel();
+ }
+ if (member.isFactoryConstructor()) {
// The type variable is stored in a parameter of the
// factory.
return localsHandler.readLocal(argument.element);
- } else if (work.element.isInstanceMember()) {
+ } else if (member.isInstanceMember()
+ || member.isGenerativeConstructor()) {
// The type variable is stored in [this].
pushInvokeHelper1(interceptors.getGetRuntimeTypeInfo(),
localsHandler.readThis());

Powered by Google App Engine
This is Rietveld 408576698