Repeats and fixes the changes landed & reverted as CL 1789553003.

pkg/compiler/lib/compiler.dart

 // Copyright (c) 2012, 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.
 
 library compiler;
 
 import 'dart:async';
 import 'package:package_config/packages.dart';
 import 'compiler_new.dart' as new_api;
+import 'src/options.dart' show CompilerOptions;
 import 'src/old_to_new_api.dart';
 
 // Unless explicitly allowed, passing [:null:] for any argument to the
 // methods of library will result in an Error being thrown.
 
 /**
  * Returns a future that completes to the source corresponding to [uri].
  * If an exception occurs, the future completes with this exception.
  *
  * The source can be represented either as a [:List<int>:] of UTF-8 bytes or as
@@ skipping 88 matching lines @@
     Uri libraryRoot,
     Uri packageRoot,
     CompilerInputProvider inputProvider,
     DiagnosticHandler handler,
     [List<String> options = const [],
      CompilerOutputProvider outputProvider,
      Map<String, dynamic> environment = const {},
      Uri packageConfig,
      PackagesDiscoveryProvider packagesDiscoveryProvider]) {
 
-  new_api.CompilerOptions compilerOptions = new new_api.CompilerOptions.parse(
+  CompilerOptions compilerOptions = new CompilerOptions.parse(
       entryPoint: script,
       libraryRoot: libraryRoot,
       packageRoot: packageRoot,
       packageConfig: packageConfig,
       packagesDiscoveryProvider: packagesDiscoveryProvider,
       options: options,
       environment: environment);
 
   new_api.CompilerInput compilerInput = new LegacyCompilerInput(inputProvider);
   new_api.CompilerDiagnostics compilerDiagnostics =
@@ skipping 73 matching lines @@
   final String name;
 
   /**
    * This constructor is not private to support user-defined
    * diagnostic kinds.
    */
   const Diagnostic(this.ordinal, this.name);
 
   String toString() => name;
 }