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

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

Issue 34963002: Fix another closure/type variable error by using analyzeTypeVariables. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 2 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: sdk/lib/_internal/compiler/implementation/ssa/builder.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/ssa/builder.dart (revision 28989)
+++ sdk/lib/_internal/compiler/implementation/ssa/builder.dart (working copy)
@@ -1890,7 +1890,8 @@
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);
@@ -2934,7 +2935,8 @@
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 {

Powered by Google App Engine
This is Rietveld 408576698