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

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

Issue 15381002: Fix a pretty bad bug of a class inheriting a patched class. The fix is (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 7 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 22929)
+++ sdk/lib/_internal/compiler/implementation/ssa/builder.dart (working copy)
@@ -1564,9 +1564,7 @@
}
fieldValues[member] = value;
});
- },
- includeBackendMembers: true,
- includeSuperMembers: false);
+ });
}
@@ -1624,8 +1622,7 @@
constructorArguments.add(potentiallyCheckType(
fieldValues[member], member.computeType(compiler)));
},
- includeBackendMembers: true,
- includeSuperMembers: true);
+ includeSuperAndInjectedMembers: true);
InterfaceType type = classElement.computeType(compiler);
HType ssaType = new HType.nonNullExact(type, compiler);
@@ -2487,10 +2484,9 @@
// TODO(ahe): This should be registered in codegen, not here.
compiler.enqueuer.codegen.registerInstantiatedClass(
closureClassElement, work.resolutionTree);
- assert(!closureClassElement.hasLocalScopeMembers);
List<HInstruction> capturedVariables = <HInstruction>[];
- closureClassElement.forEachBackendMember((Element member) {
+ closureClassElement.forEachMember((_, Element member) {
// The backendMembers also contains the call method(s). We are only
// interested in the fields.
if (member.isField()) {

Powered by Google App Engine
This is Rietveld 408576698