Chromium Code Reviews| Index: pkg/fletchc/lib/src/fletch_registry.dart |
| diff --git a/pkg/fletchc/lib/src/fletch_registry.dart b/pkg/fletchc/lib/src/fletch_registry.dart |
| index 3ce89ba2b4290bdd3a9bd161e980aa531402817b..eec3e5153d8e00820acfce8f5661234d82f1eba6 100644 |
| --- a/pkg/fletchc/lib/src/fletch_registry.dart |
| +++ b/pkg/fletchc/lib/src/fletch_registry.dart |
| @@ -4,16 +4,21 @@ |
| 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; |
| import 'package:compiler/src/elements/elements.dart' show |
| ClassElement, |
| @@ -21,19 +26,10 @@ import 'package:compiler/src/elements/elements.dart' show |
| 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; |
| @@ -84,35 +80,27 @@ abstract class FletchRegistry { |
| factory FletchRegistry( |
| FletchCompilerImplementation compiler, |
| - TreeElements treeElements) = FletchRegistryImplementation; |
| + GlobalDependencyRegistry globalRegistry) = FletchRegistryImplementation; |
| FletchRegistry.internal(this.world); |
| Registry get asRegistry; |
| - void registerStaticInvocation(Element element) { |
| + void registerStaticUse(StaticUse staticUse) { |
| // TODO(ahe): Call a different method. |
| - world.registerStaticUse(element); |
| + world.registerStaticUse(staticUse); |
| } |
| void registerInstantiatedClass(ClassElement element) { |
| - world.registerInstantiatedType(element.rawType, this.asRegistry); |
| - } |
| - |
| - void registerDynamicSetter(UniverseSelector selector) { |
| - world.registerDynamicSetter(selector); |
| - } |
| - |
| - void registerDynamicGetter(UniverseSelector selector) { |
| - world.registerDynamicGetter(selector); |
| + world.registerInstantiatedType(element.rawType); |
| } |
| - void registerDynamicInvocation(UniverseSelector selector) { |
| - world.registerDynamicInvocation(selector); |
| + void registerDynamicUse(DynamicUse use) { |
| + world.registerDynamicUse(use); |
| } |
| void registerInstantiatedType(InterfaceType type) { |
| - world.registerInstantiatedType(type, this.asRegistry); |
| + world.registerInstantiatedType(type); |
| } |
| void registerIsCheck(DartType type) { |
| @@ -146,12 +134,12 @@ abstract class FletchRegistry { |
| @proxy |
| class FletchRegistryImplementation extends FletchRegistry |
| - implements CodegenRegistry { |
| - final TreeElements treeElements; |
| + implements GlobalDependencyRegistry { |
| + final GlobalDependencyRegistry globalRegistry; |
|
ahe
2015/11/17 16:44:09
I don't understand this change.
sigurdm
2015/11/19 14:33:47
This is no longer needed.
Fixed.
|
| FletchRegistryImplementation( |
| FletchCompilerImplementation compiler, |
| - this.treeElements) |
| + this.globalRegistry) |
| : super.internal(compiler.enqueuer.codegen); |
| Registry get asRegistry => this; |
| @@ -160,6 +148,6 @@ class FletchRegistryImplementation extends FletchRegistry |
| // TODO(ahe): Remove this method, called by [Enqueuer], not [FletchEnqueuer]. |
| void registerDependency(Element element) { |
| - treeElements.registerDependency(element); |
| + globalRegistry.registerDependency(element); |
| } |
| } |