Rework UnlinkedPublicName.constMembers.

pkg/analyzer/lib/src/summary/prelink.dart

Index: pkg/analyzer/lib/src/summary/prelink.dart
diff --git a/pkg/analyzer/lib/src/summary/prelink.dart b/pkg/analyzer/lib/src/summary/prelink.dart
index 82ab7c5323251a47a92818df01ada758d9ddd9c1..cecc936bd2eaa311448793266b971b5c37bb337a 100644
--- a/pkg/analyzer/lib/src/summary/prelink.dart
+++ b/pkg/analyzer/lib/src/summary/prelink.dart
@@ -194,9 +194,9 @@ class _Prelinker {
         aggregated.putIfAbsent(name.name, () {
           if (name.kind == ReferenceKind.classOrEnum) {
             Map<String, _Meaning> namespace = <String, _Meaning>{};
-            name.constMembers.forEach((executable) {
-              namespace[executable.name] = new _Meaning(unitNum,
-                  executable.kind, 0, executable.numTypeParameters);
+            name.members.forEach((executable) {
+              namespace[executable.name] = new _Meaning(
+                  unitNum, executable.kind, 0, executable.numTypeParameters);
             });
             return new _ClassMeaning(
                 unitNum, dependency, name.numTypeParameters, namespace);
@@ -267,15 +267,14 @@ class _Prelinker {
         });
         cls.executables.forEach((executable) {
           ReferenceKind kind = null;
-          if (executable.kind == UnlinkedExecutableKind.constructor &&
-              executable.isConst) {
+          if (executable.kind == UnlinkedExecutableKind.constructor) {
             kind = ReferenceKind.constructor;
           } else if (executable.kind ==
                   UnlinkedExecutableKind.functionOrMethod &&
               executable.isStatic) {
             kind = ReferenceKind.method;
           }
-          if (kind != null) {
+          if (kind != null && executable.name.isNotEmpty) {
             namespace[executable.name] = new _Meaning(
                 unitNum, kind, 0, executable.typeParameters.length);
           }