Roll sdk dependency to 34357cdad108dcba734949bd13bd28c76ea285e0

pkg/fletchc/lib/src/fletch_registry.dart

 // Copyright (c) 2015, the Fletch 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.md file.
 
 library fletchc.fletch_codegen_registry;
 
-import 'package:compiler/src/dart2jslib.dart' show
-    CodegenRegistry,
+import 'package:compiler/src/compiler.dart' show
+    GlobalDependencyRegistry;
+
+import 'package:compiler/src/common/codegen.dart' show
+    CodegenRegistry;
+
+import 'package:compiler/src/common/registry.dart' show
     Registry;
 
-import 'package:compiler/src/constants/values.dart' show
-    ConstantValue;
+import 'package:compiler/src/universe/selector.dart' show
+    Selector;
 
-import 'package:compiler/src/universe/universe.dart' show
-    Selector,
-    UniverseSelector;
+import 'package:compiler/src/universe/use.dart' show
+    DynamicUse,
+    StaticUse;

[ahe, 2015/12/01 10:12:13]

Shouldn't be imported here.

[sigurdm, 2015/12/03 14:48:10]

Done.

 
 import 'package:compiler/src/elements/elements.dart' show
     ClassElement,
     Element,
     FunctionElement,
     LocalElement;
 
-import 'package:compiler/src/resolution/resolution.dart' show
-    TreeElements;
-
 import 'package:compiler/src/dart_types.dart' show
     DartType,
     InterfaceType;
 
-import 'package:compiler/src/util/util.dart' show
-    Setlet;
-
-import 'fletch_backend.dart' show
-    FletchBackend;
-
 import 'fletch_compiler_implementation.dart' show
     FletchCompilerImplementation;
 
 import 'fletch_enqueuer.dart' show
     FletchEnqueuer;
 
 /// Represents ways a function can used as a closure.  See also [Closurization]
 /// in [./dynamic_call_enqueuer.dart].
 enum ClosureKind {
   // Notes:
@@ skipping 23 matching lines @@
   /// The result of getting an instance method named "call"
   functionLikeTearOff,
 
   /// A local function (aka closure) that has escaped
   localFunction,
 
   /// The result of getting a super instance function
   superTearOff,
 }
 
-get _notImplemented => throw "not implemented";
-
-abstract class FletchRegistry {
+class FletchRegistry {
   final FletchEnqueuer world;
 
-  factory FletchRegistry(
-      FletchCompilerImplementation compiler,
-      TreeElements treeElements) = FletchRegistryImplementation;
+  FletchRegistry(FletchCompilerImplementation compiler)
+      : world = compiler.enqueuer.codegen;
 
-  FletchRegistry.internal(this.world);
-
-  Registry get asRegistry;
-
-  void registerStaticInvocation(Element element) {
+  void registerStaticUse(StaticUse staticUse) {

[ahe, 2015/12/01 10:12:13]

Also think this is the wrong API.

[sigurdm, 2015/12/03 14:48:10]

Done.

     // TODO(ahe): Call a different method.
-    world.registerStaticUse(element);
+    world.registerStaticUse(staticUse);
   }
 
   void registerInstantiatedClass(ClassElement element) {
-    world.registerInstantiatedType(element.rawType, this.asRegistry);
+    world.registerInstantiatedType(element.rawType);
   }
 
-  void registerDynamicSetter(UniverseSelector selector) {
-    world.registerDynamicSetter(selector);
-  }
-
-  void registerDynamicGetter(UniverseSelector selector) {
-    world.registerDynamicGetter(selector);
-  }
-
-  void registerDynamicInvocation(UniverseSelector selector) {
-    world.registerDynamicInvocation(selector);
+  void registerDynamicUse(Selector selector) {
+    world.registerDynamicUse(new DynamicUse(selector, null));

[ahe, 2015/12/01 10:12:13]

Shouldn't instantiate DynamicUse.

[sigurdm, 2015/12/03 14:48:10]

Done.

   }
 
   void registerInstantiatedType(InterfaceType type) {
-    world.registerInstantiatedType(type, this.asRegistry);
+    world.registerInstantiatedType(type);
   }
 
   void registerIsCheck(DartType type) {
     world.registerIsCheck(type);
   }
 
   void registerLocalInvoke(LocalElement element, Selector selector) {
     world.recordElementUsage(element, selector);
   }
 
@@ skipping 10 matching lines @@
         assert(function.isInstanceMember);
         assert(function.name == "call");
         break;
 
       case ClosureKind.localFunction:
         assert(function.memberContext != function);
     }
     world.dynamicCallEnqueuer.enqueueClosure(function, kind);
   }
 }
-
-@proxy
-class FletchRegistryImplementation extends FletchRegistry
-    implements CodegenRegistry {
-  final TreeElements treeElements;
-
-  FletchRegistryImplementation(
-      FletchCompilerImplementation compiler,
-      this.treeElements)
-      : super.internal(compiler.enqueuer.codegen);
-
-  Registry get asRegistry => this;
-
-  noSuchMethod(invocation) => super.noSuchMethod(invocation);
-
-  // TODO(ahe): Remove this method, called by [Enqueuer], not [FletchEnqueuer].
-  void registerDependency(Element element) {
-    treeElements.registerDependency(element);
-  }
-}