| Index: dart/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart
|
| diff --git a/dart/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart b/dart/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart
|
| index 0bfb5df1a83d7e529fc110934e372a6a0ba872b4..8a2f2b8ff5c846f84c41d419f880a0b5a028bb5f 100644
|
| --- a/dart/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart
|
| +++ b/dart/sdk/lib/_internal/compiler/implementation/js_backend/js_backend.dart
|
| @@ -10,15 +10,18 @@ import '../closure.dart';
|
| import '../../compiler.dart' as api;
|
| import '../elements/elements.dart';
|
| import '../elements/modelx.dart' show FunctionElementX;
|
| -import '../dart2jslib.dart' hide Selector;
|
| +
|
| +// TODO(ahe): There seems to be a bug in the VM, so we have to hide "js".
|
| +import '../dart2jslib.dart' hide Selector, js;
|
| import '../dart_types.dart';
|
| -import '../js/js.dart' as js;
|
| +import '../js/js.dart' as jsAst;
|
| +import '../js/js.dart' show js; // TODO(ahe): VM bug, see above.
|
| import '../native_handler.dart' as native;
|
| import '../source_file.dart';
|
| import '../source_map_builder.dart';
|
| -import '../ssa/ssa.dart';
|
| +import '../ssa/ssa.dart' hide js; // TODO(ahe): VM bug, see above.
|
| import '../tree/tree.dart';
|
| -import '../universe/universe.dart';
|
| +import '../universe/universe.dart' hide js; // TODO(ahe): VM bug, see above.
|
| import '../util/characters.dart';
|
| import '../util/util.dart';
|
|
|
|
|