Small cleanup in compiler.dart
Change-Id: I2b3d3ce5925d6c7078250ab3fdadfc3daef90d73
Reviewed-on: https://dart-review.googlesource.com/55462
Reviewed-by: Sigmund Cherem <sigmund@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
diff --git a/pkg/compiler/lib/src/apiimpl.dart b/pkg/compiler/lib/src/apiimpl.dart
index 35e349a..cd2101a 100644
--- a/pkg/compiler/lib/src/apiimpl.dart
+++ b/pkg/compiler/lib/src/apiimpl.dart
@@ -18,7 +18,6 @@
import 'compiler.dart';
import 'diagnostics/messages.dart' show Message;
import 'environment.dart';
-import 'library_loader.dart';
import 'io/source_file.dart';
import 'options.dart' show CompilerOptions;
import 'platform_configuration.dart' as platform_configuration;
@@ -243,11 +242,6 @@
rethrow;
}
}
-
- Uri resolvePatchUri(String libraryName) {
- return LibraryLoaderTask.resolvePatchUri(
- libraryName, options.platformConfigUri);
- }
}
class _Environment implements Environment {
diff --git a/pkg/compiler/lib/src/compiler.dart b/pkg/compiler/lib/src/compiler.dart
index 46e94d6..4ef8f23 100644
--- a/pkg/compiler/lib/src/compiler.dart
+++ b/pkg/compiler/lib/src/compiler.dart
@@ -24,7 +24,6 @@
import 'enqueue.dart' show Enqueuer, EnqueueTask, ResolutionEnqueuer;
import 'environment.dart';
import 'frontend_strategy.dart';
-import 'id_generator.dart';
import 'io/source_information.dart' show SourceInformation;
import 'js_backend/backend.dart' show JavaScriptBackend;
import 'kernel/kernel_backend_strategy.dart';
@@ -51,7 +50,6 @@
api.CompilerInput get provider;
- final IdGenerator idGenerator = new IdGenerator();
FrontendStrategy frontendStrategy;
BackendStrategy backendStrategy;
CompilerDiagnosticReporter _reporter;
@@ -165,6 +163,7 @@
tasks = [
libraryLoader =
frontendStrategy.createLibraryLoader(provider, reporter, measurer),
+ kernelFrontEndTask,
globalInference = new GlobalTypeInferenceTask(this),
constants = backend.constantCompilerTask,
deferredLoadTask = frontendStrategy.createDeferredLoadTask(this),
@@ -174,7 +173,6 @@
dumpInfoTask = new DumpInfoTask(this),
selfTask,
];
- tasks.add(kernelFrontEndTask);
tasks.addAll(backend.tasks);
}
@@ -192,6 +190,7 @@
ResolutionWorldBuilder get resolutionWorldBuilder =>
enqueuer.resolution.worldBuilder;
+
CodegenWorldBuilder get codegenWorldBuilder {
assert(
_codegenWorldBuilder != null,
@@ -248,12 +247,6 @@
return loadedLibraries;
}
- /**
- * Get an [Uri] pointing to a patch for the dart: library with
- * the given path. Returns null if there is no patch.
- */
- Uri resolvePatchUri(String dartLibraryPath);
-
Future runInternal(Uri uri) async {
mainLibraryUri = uri;
// TODO(ahe): This prevents memory leaks when invoking the compiler
diff --git a/pkg/compiler/lib/src/id_generator.dart b/pkg/compiler/lib/src/id_generator.dart
deleted file mode 100644
index 9107c7a..0000000
--- a/pkg/compiler/lib/src/id_generator.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-/// A generator of globally unique identifiers.
-class IdGenerator {
- int _nextFreeId = 0;
-
- /// Returns the next free identifier.
- ///
- /// This identifier is guaranteed to be unique.
- int getNextFreeId() => _nextFreeId++;
-}