Index: pkg/fletchc/lib/src/debug_info_function_codegen.dart |
diff --git a/pkg/fletchc/lib/src/debug_info_function_codegen.dart b/pkg/fletchc/lib/src/debug_info_function_codegen.dart |
index be514cef262d131a1f81966776e36ba65edd62be..2a0bc3d71167a43f3b3a9b9a0f38a4eca5f0884c 100644 |
--- a/pkg/fletchc/lib/src/debug_info_function_codegen.dart |
+++ b/pkg/fletchc/lib/src/debug_info_function_codegen.dart |
@@ -5,17 +5,14 @@ |
library fletchc.debug_info_function_codegen; |
import 'package:compiler/src/elements/elements.dart'; |
-import 'package:compiler/src/resolution/resolution.dart'; |
+import 'package:compiler/src/resolution/tree_elements.dart'; |
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/universe/selector.dart'; |
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'; |
@@ -25,9 +22,6 @@ import 'codegen_visitor.dart'; |
import 'fletch_function_builder.dart' show |
FletchFunctionBuilder; |
-import 'fletch_registry.dart' show |
- FletchRegistry; |
- |
import 'debug_registry.dart' show |
DebugRegistry; |
@@ -43,11 +37,10 @@ class DebugInfoFunctionCodegen extends FunctionCodegen with DebugRegistry { |
FletchFunctionBuilder functionBuilder, |
FletchContext context, |
TreeElements elements, |
- FletchRegistry registry, |
ClosureEnvironment closureEnvironment, |
FunctionElement function, |
this.compiler) |
- : super(functionBuilder, context, elements, registry, |
+ : super(functionBuilder, context, elements, null, |
closureEnvironment, function) { |
if (functionBuilder.isInstanceMember) pushVariableDeclaration(thisValue); |
} |
@@ -79,14 +72,14 @@ class DebugInfoFunctionCodegen extends FunctionCodegen with DebugRegistry { |
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) { |