Fix another closure/type variable error by using analyzeTypeVariables.

sdk/lib/_internal/compiler/implementation/ssa/builder.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of ssa;
 
 /**
  * A special element for the extra parameter taken by intercepted
  * methods. We need to override [Element.computeType] because our
  * optimizers may look at its declared type.
@@ skipping 1872 matching lines @@
       return new HTypeConversion.withTypeRepresentation(type, kind, subtype,
           original, typeVariable);
     } else if (type.kind == TypeKind.FUNCTION) {
       if (backend.rti.isSimpleFunctionType(type)) {
         return original.convertType(compiler, type, kind);
       }
       HType subtype = original.instructionType;
       if (type.containsTypeVariables) {
         bool contextIsTypeArguments = false;
         HInstruction context;
-        if (currentElement.isInstanceMember()) {
+        if (!currentElement.enclosingElement.isClosure()
+            && currentElement.isInstanceMember()) {
           context = localsHandler.readThis();
         } else {
           ClassElement contextClass = Types.getClassContext(type);
           context = buildTypeVariableList(contextClass);
           add(context);
           contextIsTypeArguments = true;
         }
         return new HTypeConversion.withContext(type, kind, subtype,
             original, context, contextIsTypeArguments: contextIsTypeArguments);
       } else {
@@ skipping 1023 matching lines @@
           node, compiler);
 
       HInstruction contextName;
       HInstruction context;
       HInstruction typeArguments;
       if (type.containsTypeVariables) {
         ClassElement contextClass = Types.getClassContext(type);
         contextName = graph.addConstantString(
             new DartString.literal(backend.namer.getNameOfClass(contextClass)),
             node, compiler);
-        if (currentElement.isInstanceMember()) {
+        if (!currentElement.enclosingElement.isClosure()
+            && currentElement.isInstanceMember()) {
           context = localsHandler.readThis();
           typeArguments = graph.addConstantNull(compiler);
         } else {
           context = graph.addConstantNull(compiler);
           typeArguments = buildTypeVariableList(contextClass);
           add(typeArguments);
         }
       } else {
         contextName = graph.addConstantNull(compiler);
         context = graph.addConstantNull(compiler);
@@ skipping 2638 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }