Index: pkg/fletchc/lib/incremental/scope_information_visitor.dart |
diff --git a/pkg/fletchc/lib/incremental/scope_information_visitor.dart b/pkg/fletchc/lib/incremental/scope_information_visitor.dart |
index a269461f6b4cca6150d0ca1edfe03b8625077e45..fe4090208f54b9493572149ace2ee3f2f48b955b 100644 |
--- a/pkg/fletchc/lib/incremental/scope_information_visitor.dart |
+++ b/pkg/fletchc/lib/incremental/scope_information_visitor.dart |
@@ -9,7 +9,7 @@ import 'package:compiler/src/elements/modelx.dart' as modelx; |
import 'package:compiler/src/elements/visitor.dart' show |
ElementVisitor; |
-import 'package:compiler/src/dart2jslib.dart' show |
+import 'package:compiler/src/compiler.dart' show |
Compiler; |
import 'package:compiler/src/elements/elements.dart' show |
@@ -71,7 +71,7 @@ class ScopeInformationVisitor extends ElementVisitor/* <void> */ { |
// TODO(ahe): We omit the import scope if there is no current |
// class. That's wrong. |
omitEnclosing: ignoreImports || currentClass == null, |
- name: e.getLibraryName(), |
+ name: e.libraryName, |
serializeEnclosing: () { |
// The enclosing scope of a library is a scope which contains all the |
// imported names. |
@@ -117,7 +117,7 @@ class ScopeInformationVisitor extends ElementVisitor/* <void> */ { |
{bool isStatic: false, |
bool omitEnclosing: false, |
bool includeSuper: false}) { |
- e.ensureResolved(compiler); |
+ e.ensureResolved(compiler.resolution); |
bool isFirst = true; |
var serializeEnclosing; |
String kind; |