Merge libv1.

sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart

Index: sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
diff --git a/sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart b/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
similarity index 93%
rename from sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart
rename to sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
index a28bb7ff3aa628f1e8bd7147863e4c3e168f23f7..fe4e6da855f1e3b705f00079eae712c329914f26 100644
--- a/sdk/lib/_internal/dartdoc/lib/src/mirrors/dart2js_mirror.dart
+++ b/sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.dart
@@ -7,24 +7,22 @@ library mirrors_dart2js;
 import 'dart:io';
 import 'dart:uri';
 
-import '../../../../compiler/compiler.dart' as diagnostics;
-import '../../../../compiler/implementation/elements/elements.dart';
-import '../../../../compiler/implementation/resolution/resolution.dart'
-    show ResolverTask, ResolverVisitor;
-import '../../../../compiler/implementation/apiimpl.dart' as api;
-import '../../../../compiler/implementation/scanner/scannerlib.dart';
-import '../../../../compiler/implementation/ssa/ssa.dart';
-import '../../../../compiler/implementation/dart2jslib.dart';
-import '../../../../compiler/implementation/filenames.dart';
-import '../../../../compiler/implementation/source_file.dart';
-import '../../../../compiler/implementation/tree/tree.dart';
-import '../../../../compiler/implementation/util/util.dart';
-import '../../../../compiler/implementation/util/uri_extras.dart';
-import '../../../../compiler/implementation/dart2js.dart';
-import '../../../../compiler/implementation/util/characters.dart';
-
-// TODO(rnystrom): Use "package:" URL (#4968).
-import '../../mirrors.dart';
+import '../../compiler.dart' as diagnostics;
+import '../elements/elements.dart';
+import '../resolution/resolution.dart' show ResolverTask, ResolverVisitor;
+import '../apiimpl.dart' as api;
+import '../scanner/scannerlib.dart';
+import '../ssa/ssa.dart';
+import '../dart2jslib.dart';
+import '../filenames.dart';
+import '../source_file.dart';
+import '../tree/tree.dart';
+import '../util/util.dart';
+import '../util/uri_extras.dart';
+import '../dart2js.dart';
+import '../util/characters.dart';
+
+import 'mirrors.dart';
 import 'util.dart';
 
 //------------------------------------------------------------------------------
@@ -1355,81 +1353,91 @@ class Dart2JsDynamicMirror extends Dart2JsTypeElementMirror {
 class Dart2JsMethodMirror extends Dart2JsMemberMirror
     implements MethodMirror {
   final Dart2JsContainerMirror _objectMirror;
-  String _simpleName;
-  String _displayName;
-  String _constructorName;
-  String _operatorName;
-  Dart2JsMethodKind _kind;
-
-  Dart2JsMethodMirror(Dart2JsContainerMirror objectMirror,
-                      FunctionElement function)
+  final String simpleName;
+  final String displayName;
+  final String constructorName;
+  final String operatorName;
+  final Dart2JsMethodKind _kind;
+
+  Dart2JsMethodMirror._internal(Dart2JsContainerMirror objectMirror,
+      FunctionElement function,
+      String this.simpleName,
+      String this.displayName,
+      String this.constructorName,
+      String this.operatorName,
+      Dart2JsMethodKind this._kind)
       : this._objectMirror = objectMirror,
-        super(objectMirror.mirrors, function) {
-    _simpleName = _element.name.slowToString();
-    if (_function.kind == ElementKind.GETTER) {
-      _kind = Dart2JsMethodKind.GETTER;
-      _displayName = _simpleName;
-    } else if (_function.kind == ElementKind.SETTER) {
-      _kind = Dart2JsMethodKind.SETTER;
-      _displayName = _simpleName;
-      _simpleName = '$_simpleName=';
-    } else if (_function.kind == ElementKind.GENERATIVE_CONSTRUCTOR) {
+        super(objectMirror.mirrors, function);
+
+  factory Dart2JsMethodMirror(Dart2JsContainerMirror objectMirror,
+                              FunctionElement function) {
+    String simpleName = function.name.slowToString();
+    String displayName;
+    String constructorName = null;
+    String operatorName = null;
+    Dart2JsMethodKind kind;
+    if (function.kind == ElementKind.GETTER) {
+      kind = Dart2JsMethodKind.GETTER;
+      displayName = simpleName;
+    } else if (function.kind == ElementKind.SETTER) {
+      kind = Dart2JsMethodKind.SETTER;
+      displayName = simpleName;
+      simpleName = '$simpleName=';
+    } else if (function.kind == ElementKind.GENERATIVE_CONSTRUCTOR) {
       // TODO(johnniwinther): Support detection of redirecting constructors.
-      _constructorName = '';
-      int dollarPos = _simpleName.indexOf('\$');
+      constructorName = '';
+      int dollarPos = simpleName.indexOf('\$');
       if (dollarPos != -1) {
-        _constructorName = _simpleName.substring(dollarPos + 1);
-        _simpleName = _simpleName.substring(0, dollarPos);
+        constructorName = simpleName.substring(dollarPos + 1);
+        simpleName = simpleName.substring(0, dollarPos);
         // Simple name is TypeName.constructorName.
-        _simpleName = '$_simpleName.$_constructorName';
+        simpleName = '$simpleName.$constructorName';
       } else {
         // Simple name is TypeName.
       }
-      if (_function.modifiers.isConst()) {
-        _kind = Dart2JsMethodKind.CONST;
+      if (function.modifiers.isConst()) {
+        kind = Dart2JsMethodKind.CONST;
       } else {
-        _kind = Dart2JsMethodKind.GENERATIVE;
+        kind = Dart2JsMethodKind.GENERATIVE;
       }
-      _displayName = _simpleName;
-    } else if (_function.modifiers.isFactory()) {
-      _kind = Dart2JsMethodKind.FACTORY;
-      _constructorName = '';
-      int dollarPos = _simpleName.indexOf('\$');
+      displayName = simpleName;
+    } else if (function.modifiers.isFactory()) {
+      kind = Dart2JsMethodKind.FACTORY;
+      constructorName = '';
+      int dollarPos = simpleName.indexOf('\$');
       if (dollarPos != -1) {
-        _constructorName = _simpleName.substring(dollarPos+1);
-        _simpleName = _simpleName.substring(0, dollarPos);
-        _simpleName = '$_simpleName.$_constructorName';
+        constructorName = simpleName.substring(dollarPos+1);
+        simpleName = simpleName.substring(0, dollarPos);
+        simpleName = '$simpleName.$constructorName';
       }
       // Simple name is TypeName.constructorName.
-      _displayName = _simpleName;
-    } else if (_simpleName == 'negate') {
-      _kind = Dart2JsMethodKind.OPERATOR;
-      _operatorName = '-';
+      displayName = simpleName;
+    } else if (simpleName == 'negate') {
+      kind = Dart2JsMethodKind.OPERATOR;
+      operatorName = '-';
       // Simple name is 'unary-'.
-      _simpleName = Mirror.UNARY_MINUS;
+      simpleName = Mirror.UNARY_MINUS;
       // Display name is 'operator operatorName'.
-      _displayName = 'operator -';
-    } else if (_simpleName.startsWith('operator\$')) {
-      String str = _simpleName.substring(9);
-      _simpleName = 'operator';
-      _kind = Dart2JsMethodKind.OPERATOR;
-      _operatorName = _getOperatorFromOperatorName(str);
+      displayName = 'operator -';
+    } else if (simpleName.startsWith('operator\$')) {
+      String str = simpleName.substring(9);
+      simpleName = 'operator';
+      kind = Dart2JsMethodKind.OPERATOR;
+      operatorName = _getOperatorFromOperatorName(str);
       // Simple name is 'operator operatorName'.
-      _simpleName = _operatorName;
+      simpleName = operatorName;
       // Display name is 'operator operatorName'.
-      _displayName = 'operator $_operatorName';
+      displayName = 'operator $operatorName';
     } else {
-      _kind = Dart2JsMethodKind.REGULAR;
-      _displayName = _simpleName;
+      kind = Dart2JsMethodKind.REGULAR;
+      displayName = simpleName;
     }
+    return new Dart2JsMethodMirror._internal(objectMirror, function,
+        simpleName, displayName, constructorName, operatorName, kind);
   }
 
   FunctionElement get _function => _element;
 
-  String get simpleName => _simpleName;
-
-  String get displayName => _displayName;
-
   String get qualifiedName
       => '${owner.qualifiedName}.$simpleName';
 
@@ -1469,16 +1477,12 @@ class Dart2JsMethodMirror extends Dart2JsMemberMirror
 
   bool get isFactoryConstructor => _kind == Dart2JsMethodKind.FACTORY;
 
-  String get constructorName => _constructorName;
-
   bool get isGetter => _kind == Dart2JsMethodKind.GETTER;
 
   bool get isSetter => _kind == Dart2JsMethodKind.SETTER;
 
   bool get isOperator => _kind == Dart2JsMethodKind.OPERATOR;
 
-  String get operatorName => _operatorName;
-
   SourceLocation get location {
     var node = _function.parseNode(_diagnosticListener);
     if (node != null) {