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

Unified Diff: lib/src/compiler/code_generator.dart

Issue 1966763004: always emit lazy field if overriding static (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 4 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: lib/src/compiler/code_generator.dart
diff --git a/lib/src/compiler/code_generator.dart b/lib/src/compiler/code_generator.dart
index 95dba1cdabaa92703a3e0c6a11ea8fa81638d0fa..6260969e3312c14891d377173971a17ea6113e3e 100644
--- a/lib/src/compiler/code_generator.dart
+++ b/lib/src/compiler/code_generator.dart
@@ -652,8 +652,8 @@ class CodeGenerator extends GeneralizingAstVisitor
Set<FieldElement> staticFieldOverrides) {
for (var field in fields) {
for (VariableDeclaration field in field.fields.variables) {
- var overrideInfo = checkForPropertyOverride(
- field.element, superclasses, _extensionTypes);
+ var overrideInfo =
+ checkForPropertyOverride(field.element, superclasses);
if (overrideInfo.foundGetter || overrideInfo.foundSetter) {
if (field.element.isStatic) {
staticFieldOverrides.add(field.element);
@@ -964,8 +964,8 @@ class CodeGenerator extends GeneralizingAstVisitor
var methodElement = method.element as PropertyAccessorElement;
var field = methodElement.variable;
if (!field.isSynthetic) return null;
- var propertyOverrideResult = checkForPropertyOverride(
- methodElement.variable, superclasses, _extensionTypes);
+ var propertyOverrideResult =
+ checkForPropertyOverride(methodElement.variable, superclasses);
// Generate a corresponding virtual getter / setter.
var name = _elementMemberName(methodElement,
@@ -2952,7 +2952,7 @@ class CodeGenerator extends GeneralizingAstVisitor
methods.add(annotate(
new JS.Method(
access,
- js.call('function() { return #; }', _visit(node.initializer))
+ js.call('function() { return #; }', _visitInitializer(node))
as JS.Fun,
isGetter: true),
node,

Powered by Google App Engine
This is Rietveld 408576698