Chromium Code Reviews| 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 f5d271f1cf4dd1acf030c4fcb7160aa1485bbb18..7a564c10ae3aeba8e29c18f17e57e3a2ea975142 100644 |
| --- a/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart |
| +++ b/pkg/compiler/lib/src/ssa/kernel_ast_adapter.dart |
| @@ -9,23 +9,53 @@ import '../diagnostics/invariant.dart'; |
| import '../elements/elements.dart'; |
| import '../js_backend/js_backend.dart'; |
| import '../tree/tree.dart' as ast; |
| +import '../types/masks.dart'; |
| +import '../universe/side_effects.dart'; |
| + |
| +import 'types.dart'; |
| /// A helper class that abstracts all accesses of the AST from Kernel nodes. |
| /// |
| /// The goal is to remove all need for the AST from the Kernel SSA builder. |
| class KernelAstAdapter { |
| - final JavaScriptBackend backend; |
| - final ResolvedAst resolvedAst; |
| - final Map<ir.Node, ast.Node> nodeToAst; |
| + final JavaScriptBackend _backend; |
| + final ResolvedAst _resolvedAst; |
| + final Map<ir.Node, ast.Node> _nodeToAst; |
| + final Map<ir.Node, Element> _nodeToElement; |
| - KernelAstAdapter(this.backend, this.resolvedAst, this.nodeToAst); |
| + KernelAstAdapter(this._backend, this._resolvedAst, this._nodeToAst, |
| + this._nodeToElement, Map<FunctionElement, ir.Member> functions) { |
| + for (FunctionElement functionElement in functions.keys) { |
| + _nodeToElement[functions[functionElement]] = functionElement; |
| + } |
| + } |
| - ConstantValue getConstantFor(ir.Node node) { |
| - ast.Node astNode = nodeToAst[node]; |
| - ConstantValue constantValue = backend.constants |
| - .getConstantValueForNode(astNode, resolvedAst.elements); |
| + ConstantValue getConstantForSymbol(ir.SymbolLiteral node) { |
| + ast.Node astNode = _nodeToAst[node]; |
| + ConstantValue constantValue = _backend.constants |
| + .getConstantValueForNode(astNode, _resolvedAst.elements); |
| assert(invariant(astNode, constantValue != null, |
| message: 'No constant computed for $node')); |
| return constantValue; |
| } |
| + |
| + Element getElement(ir.Node node) { |
| + Element result = _nodeToElement[node]; |
| + assert(result != null); |
| + return result; |
| + } |
| + |
| + bool getCanThrow(ir.Procedure procedure) { |
| + FunctionElement function = getElement(procedure); |
| + return !_backend.compiler.world.getCannotThrow(function); |
| + } |
| + |
| + TypeMask getTypeMask(ir.Node node) { |
|
Siggi Cherem (dart-lang)
2016/08/29 23:54:15
nit: maybe rename to `returnTypeOf`? and rename th
Harry Terkelsen
2016/08/30 00:05:41
Done.
|
| + return TypeMaskFactory.inferredReturnTypeForElement( |
| + getElement(node), _backend.compiler); |
| + } |
| + |
| + SideEffects getSideEffects(ir.Node node) { |
| + return _backend.compiler.world.getSideEffectsOfElement(getElement(node)); |
| + } |
| } |