build kernel for the entire program after resolution

pkg/compiler/lib/src/ssa/builder_kernel.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/codegen.dart' show CodegenRegistry, CodegenWorkItem;
 import '../common/tasks.dart' show CompilerTask;
 import '../compiler.dart';
@@ skipping 19 matching lines @@
   String get name => 'SSA kernel builder';
 
   SsaKernelBuilderTask(JavaScriptBackend backend, this.sourceInformationFactory)
       : backend = backend,
         super(backend.compiler.measurer);
 
   HGraph build(CodegenWorkItem work) {
     return measure(() {
       AstElement element = work.element.implementation;
       TreeElements treeElements = work.resolvedAst.elements;
-      Kernel kernel = new Kernel(backend.compiler);
-      KernelVisitor visitor = new KernelVisitor(element, treeElements, kernel);
-      IrFunction function;
-      try {
-        function = visitor.buildFunction();
-      } catch (e) {
-        throw "Failed to convert to Kernel IR: $e";
-      }
+//      Kernel kernel = new Kernel(backend.compiler);

[Siggi Cherem (dart-lang), 2016/09/09 22:49:23]

delete?

[Harry Terkelsen, 2016/09/09 22:56:47]

Done.

+//      KernelVisitor visitor = new KernelVisitor(element, treeElements, kernel);
+//      IrFunction function;
+//      try {
+//        function = visitor.buildFunction();
+//      } catch (e) {
+//        throw "Failed to convert to Kernel IR: $e";
+//      }
+      Kernel kernel = backend.kernelTask.kernel;
+      ir.Procedure function = kernel.functions[element];
       KernelSsaBuilder builder = new KernelSsaBuilder(
           function,
           element,
           work.resolvedAst,
           backend.compiler,
           work.registry,
           sourceInformationFactory,
-          visitor,
           kernel);
       return builder.build();
     });
   }
 }
 
 class KernelSsaBuilder extends ir.Visitor with GraphBuilder {
-  final IrFunction function;
+  final ir.Procedure function;
   final FunctionElement functionElement;
   final ResolvedAst resolvedAst;
   final Compiler compiler;
   final CodegenRegistry registry;
 
   JavaScriptBackend get backend => compiler.backend;
 
   SourceInformationBuilder sourceInformationBuilder;
   KernelAstAdapter astAdapter;
 
   KernelSsaBuilder(
       this.function,
       this.functionElement,
       this.resolvedAst,
       this.compiler,
       this.registry,
       SourceInformationStrategy sourceInformationFactory,
-      KernelVisitor visitor,
       Kernel kernel) {
     graph.element = functionElement;
     // TODO(het): Should sourceInformationBuilder be in GraphBuilder?
     this.sourceInformationBuilder =
         sourceInformationFactory.createBuilderForContext(resolvedAst);
     graph.sourceInformation =
         sourceInformationBuilder.buildVariableDeclaration();
     this.localsHandler =
         new LocalsHandler(this, functionElement, null, compiler);
     this.astAdapter = new KernelAstAdapter(
         compiler.backend,
         resolvedAst,
-        visitor.nodeToAst,
-        visitor.nodeToElement,
+        kernel.nodeToAst,
+        kernel.nodeToElement,
         kernel.functions,
         kernel.classes,
         kernel.libraries);
   }
 
   HGraph build() {
     // TODO(het): no reason to do this here...
     HInstruction.idCounter = 0;
     if (function.kind == ir.ProcedureKind.Method ||
         function.kind == ir.ProcedureKind.Operator) {
@@ skipping 19 matching lines @@
 
   // TODO(het): This implementation is shared with [SsaBuilder]. Should we just
   // allow [GraphBuilder] to access `compiler`?
   @override
   pushCheckNull(HInstruction expression) {
     push(new HIdentity(
         expression, graph.addConstantNull(compiler), null, backend.boolType));
   }
 
   /// Builds a SSA graph for [method].
-  void buildMethod(IrFunction method, FunctionElement functionElement) {
-    openFunction(method, functionElement);
-    method.node.body.accept(this);
+  void buildMethod(ir.Procedure method, FunctionElement functionElement) {
+    openFunction(functionElement);
+    method.function.body.accept(this);
     closeFunction();
   }
 
-  void openFunction(IrFunction method, FunctionElement functionElement) {
+  // TODO(het): get function element from astAdapter?
+  void openFunction(FunctionElement functionElement) {
     HBasicBlock block = graph.addNewBlock();
     open(graph.entry);
     localsHandler.startFunction(functionElement, resolvedAst.node);
     close(new HGoto()).addSuccessor(block);
 
     open(block);
   }
 
   void closeFunction() {
     if (!isAborted()) closeAndGotoExit(new HGoto());
@@ skipping 154 matching lines @@
   visitThisExpression(ir.ThisExpression thisExpression) {
     stack.add(localsHandler.readThis());
   }
 
   @override
   visitNot(ir.Not not) {
     not.operand.accept(this);
     push(new HNot(popBoolified(), backend.boolType));
   }
 }