Index: pkg/fletchc/lib/src/debug_info_constructor_codegen.dart |
diff --git a/pkg/fletchc/lib/src/debug_info_constructor_codegen.dart b/pkg/fletchc/lib/src/debug_info_constructor_codegen.dart |
index 6445876d66e1b94cbbea4c20dccf3ea40274b659..e7a1d3f289be43d2b78d4ddc948dbbcf4db72a97 100644 |
--- a/pkg/fletchc/lib/src/debug_info_constructor_codegen.dart |
+++ b/pkg/fletchc/lib/src/debug_info_constructor_codegen.dart |
@@ -5,17 +5,16 @@ |
library fletchc.debug_info_constructor_codegen; |
import 'package:compiler/src/elements/elements.dart'; |
-import 'package:compiler/src/resolution/resolution.dart'; |
+import 'package:compiler/src/universe/selector.dart' show |
+ Selector; |
import 'package:compiler/src/tree/tree.dart'; |
-import 'package:compiler/src/universe/universe.dart'; |
- |
-import 'package:compiler/src/dart2jslib.dart' show |
- Registry; |
+import 'package:compiler/src/resolution/tree_elements.dart' show |
+ TreeElements; |
import 'package:compiler/src/dart_types.dart' show |
DartType; |
-import 'package:compiler/src/util/util.dart' show |
+import 'package:compiler/src/diagnostics/spannable.dart' show |
Spannable; |
import 'bytecode_assembler.dart'; |
@@ -49,12 +48,11 @@ class DebugInfoConstructorCodegen extends ConstructorCodegen |
FletchFunctionBuilder functionBuilder, |
FletchContext context, |
TreeElements elements, |
- FletchRegistry registry, |
ClosureEnvironment closureEnvironment, |
ConstructorElement constructor, |
FletchClassBuilder classBuilder, |
this.compiler) |
- : super(functionBuilder, context, elements, registry, |
+ : super(functionBuilder, context, elements, null, |
closureEnvironment, constructor, classBuilder); |
LazyFieldInitializerCodegen lazyFieldInitializerCodegenFor( |
@@ -66,7 +64,6 @@ class DebugInfoConstructorCodegen extends ConstructorCodegen |
function, |
context, |
elements, |
- null, |
context.backend.createClosureEnvironment(field, elements), |
field, |
compiler); |
@@ -112,14 +109,14 @@ class DebugInfoConstructorCodegen extends ConstructorCodegen |
super.invokeMethod(node, selector); |
} |
- void invokeGetter(Node node, Selector selector) { |
+ void invokeGetter(Node node, Name name) { |
recordDebugInfo(node); |
- super.invokeGetter(node, selector); |
+ super.invokeGetter(node, name); |
} |
- void invokeSetter(Node node, Selector selector) { |
+ void invokeSetter(Node node, Name name) { |
recordDebugInfo(node); |
- super.invokeSetter(node, selector); |
+ super.invokeSetter(node, name); |
} |
void invokeFactory(Node node, int constId, int arity) { |