diff --git a/pkg/dev_compiler/lib/src/kernel/compiler.dart b/pkg/dev_compiler/lib/src/kernel/compiler.dart index 3ec3f3fe42f..51dac497455 100644 --- a/pkg/dev_compiler/lib/src/kernel/compiler.dart +++ b/pkg/dev_compiler/lib/src/kernel/compiler.dart @@ -2375,12 +2375,8 @@ class ProgramCompiler extends ComputeOnceConstantVisitor : _getSymbol(virtualField); var jsInit = _visitInitializer(initializer, f.annotations); body.add( - jsInit - .toAssignExpression( - js.call('this.#', [access]) - ..sourceInformation = _nodeStart(hoverInfo), - ) - .toStatement(), + jsInit.toAssignExpression(js.call('this.#', [access])).toStatement() + ..sourceInformation = _nodeStart(hoverInfo), ); } diff --git a/pkg/dev_compiler/lib/src/kernel/compiler_new.dart b/pkg/dev_compiler/lib/src/kernel/compiler_new.dart index ba3116f842e..3564543dabd 100644 --- a/pkg/dev_compiler/lib/src/kernel/compiler_new.dart +++ b/pkg/dev_compiler/lib/src/kernel/compiler_new.dart @@ -2665,16 +2665,15 @@ class LibraryCompiler extends ComputeOnceConstantVisitor return access; } - js_ast.Expression _emitFieldInit( + js_ast.Statement _emitFieldInit( Field f, Expression? initializer, TreeNode hoverInfo, ) { var access = _emitFieldValueAccessor(f); var jsInit = _visitInitializer(initializer, f.annotations); - return jsInit.toAssignExpression( - js.call('this.#', [access])..sourceInformation = _nodeStart(hoverInfo), - ); + return jsInit.toAssignExpression(js.call('this.#', [access])).toStatement() + ..sourceInformation = _nodeStart(hoverInfo); } /// Initialize fields. They follow the sequence: @@ -2700,7 +2699,7 @@ class LibraryCompiler extends ComputeOnceConstantVisitor continue; } _staticTypeContext.enterMember(f); - body.add(_emitFieldInit(f, init, f).toStatement()); + body.add(_emitFieldInit(f, init, f)); _staticTypeContext.leaveMember(f); } @@ -2708,7 +2707,7 @@ class LibraryCompiler extends ComputeOnceConstantVisitor if (ctor != null) { for (var init in ctor.initializers) { if (init is FieldInitializer) { - body.add(_emitFieldInit(init.field, init.value, init).toStatement()); + body.add(_emitFieldInit(init.field, init.value, init)); } else if (init is LocalInitializer) { body.add(visitVariableDeclaration(init.variable)); } else if (init is AssertInitializer) {