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

Unified Diff: pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart

Issue 2615173002: Revert "Ensure we're looking at the correct resolved AST when initializing fields in constructors." (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « pkg/compiler/lib/src/ssa/graph_builder.dart ('k') | tests/compiler/dart2js/kernel/constructors_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
diff --git a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
index 326359df4e7dfb05f8d745e84ebc2ebd6b5055c4..e108ad5a69729c0818a3827d0707bbdbad6f8a56 100644
--- a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
+++ b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart
@@ -5,8 +5,6 @@
import 'package:js_runtime/shared/embedded_names.dart';
import 'package:kernel/ast.dart' as ir;
-import 'dart:collection' show Queue;
-
import '../common.dart';
import '../common/names.dart';
import '../compiler.dart';
@@ -38,6 +36,7 @@ import 'types.dart';
class KernelAstAdapter {
final Kernel kernel;
final JavaScriptBackend _backend;
+ final ResolvedAst _resolvedAst;
final Map<ir.Node, ast.Node> _nodeToAst;
final Map<ir.Node, Element> _nodeToElement;
final Map<ir.VariableDeclaration, SyntheticLocal> _syntheticLocals =
@@ -45,12 +44,6 @@ class KernelAstAdapter {
final Map<ir.LabeledStatement, KernelJumpTarget> _jumpTargets =
<ir.LabeledStatement, KernelJumpTarget>{};
DartTypeConverter _typeConverter;
- ResolvedAst _resolvedAst;
-
- /// Sometimes for resolution the resolved AST element needs to change (for
- /// example, if we're inlining, or if we're in a constructor, but then also
- /// constructing the field values). We keep track of this with a stack.
- Queue<ResolvedAst> _resolvedAstStack;
KernelAstAdapter(this.kernel, this._backend, this._resolvedAst,
this._nodeToAst, this._nodeToElement) {
@@ -74,20 +67,6 @@ class KernelAstAdapter {
_nodeToElement[kernel.typeParameters[typeVariable]] = typeVariable;
}
_typeConverter = new DartTypeConverter(this);
- _resolvedAstStack = new Queue<ResolvedAst>();
- }
-
- /// Push the existing resolved AST on the stack and shift the current resolved
- /// AST to the AST that this kernel node points to.
- void pushResolvedAst(ir.Node node) {
- _resolvedAstStack.addLast(_resolvedAst);
- _resolvedAst = getElement(node).resolvedAst;
- }
-
- /// Pop the resolved AST stack to reset it to the previous resolved AST node.
- void popResolvedAstStack() {
- assert(_resolvedAstStack.isNotEmpty);
- _resolvedAst = _resolvedAstStack.removeLast();
}
Compiler get _compiler => _backend.compiler;
« no previous file with comments | « pkg/compiler/lib/src/ssa/graph_builder.dart ('k') | tests/compiler/dart2js/kernel/constructors_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698