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

Unified Diff: pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart

Issue 761483002: dart2js: don't pass the supername to visitFields. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 1 month 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: pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
index 13e2df190681008572bc6c6b58a45d41942953b3..cc068bd1a8231e628928363d761e1d41f8d4b52d 100644
--- a/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/old_emitter/class_emitter.dart
@@ -39,8 +39,9 @@ class ClassEmitter extends CodeEmitterHelper {
}
ClassBuilder builder = new ClassBuilder(classElement, namer);
+ builder.superName = superName;
emitClassConstructor(classElement, builder, onlyForRti: onlyForRti);
- emitFields(classElement, builder, superName, onlyForRti: onlyForRti);
+ emitFields(classElement, builder, onlyForRti: onlyForRti);
emitClassGettersSetters(classElement, builder, onlyForRti: onlyForRti);
emitInstanceMembers(classElement, builder, onlyForRti: onlyForRti);
emitter.typeTestEmitter.emitIsTests(classElement, builder);
@@ -91,7 +92,6 @@ class ClassEmitter extends CodeEmitterHelper {
/// Returns `true` if fields added.
bool emitFields(Element element,
ClassBuilder builder,
- String superName,
{ bool classIsNative: false,
bool emitStatics: false,
bool onlyForRti: false }) {
@@ -102,12 +102,6 @@ class ClassEmitter extends CodeEmitterHelper {
throw new SpannableAssertionFailure(
element, 'Must be a ClassElement or a LibraryElement');
}
- if (emitStatics) {
- assert(invariant(element, superName == null, message: superName));
- } else {
- assert(invariant(element, superName != null));
- builder.superName = superName;
- }
var fieldMetadata = [];
bool hasMetadata = false;
bool fieldsAdded = false;
@@ -311,7 +305,7 @@ class ClassEmitter extends CodeEmitterHelper {
List<jsAst.Property> statics = new List<jsAst.Property>();
ClassBuilder staticsBuilder = new ClassBuilder(classElement, namer);
- if (emitFields(classElement, staticsBuilder, null, emitStatics: true)) {
+ if (emitFields(classElement, staticsBuilder, emitStatics: true)) {
jsAst.ObjectInitializer initializer =
staticsBuilder.toObjectInitializer();
compiler.dumpInfoTask.registerElementAst(classElement,

Powered by Google App Engine
This is Rietveld 408576698